projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prep for 1.2rc8 release
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
e2bd1db
..
c8a3383
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2rc
3
Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2rc
8
Copyright by Tobi Oetiker, 1997-2005
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
@@
-22,11
+22,11
@@
void PrintUsage(char *cmd)
{
char help_main[] =
{
char help_main[] =
- "RRDtool 1.2rc3 Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
-#ifndef WIN32
- " Compiled " MAKE_TIMESTAMP "\n\n"
-#else
+ "RRDtool 1.2rc8 Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
" Compiled " __DATE__ " " __TIME__ "\n\n"
" Compiled " __DATE__ " " __TIME__ "\n\n"
+#else
+ " Compiled " MAKE_TIMESTAMP "\n\n"
#endif
"Usage: rrdtool [options] command command_options\n\n";
#endif
"Usage: rrdtool [options] command command_options\n\n";
@@
-108,7
+108,9
@@
void PrintUsage(char *cmd)
"\t\t[--zoom factor]\n"
"\t\t[--alt-autoscale]\n"
"\t\t[--alt-autoscale-max]\n"
"\t\t[--zoom factor]\n"
"\t\t[--alt-autoscale]\n"
"\t\t[--alt-autoscale-max]\n"
- "\t\t[--units-exponent value]\n"
+ "\t\t[--no-gridfit]\n"
+ "\t\t[--units-exponent value]\n"
+ "\t\t[--units-length value]\n"
"\t\t[--step seconds]\n"
"\t\t[-f|--imginfo printfstr]\n"
"\t\t[-a|--imgformat PNG]\n"
"\t\t[--step seconds]\n"
"\t\t[-f|--imginfo printfstr]\n"
"\t\t[-a|--imgformat PNG]\n"
@@
-116,12
+118,15
@@
void PrintUsage(char *cmd)
char help_graph3[] =
"\t\t[DEF:vname=rrd:ds-name:CF]\n"
"\t\t[CDEF:vname=rpn-expression]\n"
char help_graph3[] =
"\t\t[DEF:vname=rrd:ds-name:CF]\n"
"\t\t[CDEF:vname=rpn-expression]\n"
+ "\t\t[VDEF:vdefname=rpn-expression]\n"
"\t\t[PRINT:vname:CF:format]\n"
"\t\t[GPRINT:vname:CF:format]\n"
"\t\t[PRINT:vname:CF:format]\n"
"\t\t[GPRINT:vname:CF:format]\n"
+ "\t\t[PRINT:vdefname:format]\n"
+ "\t\t[GPRINT:vdefname:format]\n"
"\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
"\t\t[VRULE:value#rrggbb[aa][:legend]]\n"
"\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
"\t\t[VRULE:value#rrggbb[aa][:legend]]\n"
- "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]]]\n"
- "\t\t[AREA:vname[#rrggbb[aa][:legend]]]\n"
+ "\t\t[LINE{1|2|3}:vname[#rrggbb[aa][:legend]]
[:STACK]
]\n"
+ "\t\t[AREA:vname[#rrggbb[aa][:legend]]
[:STACK]
]\n"
"\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n";
char help_tune1[] =
"\t\t[STACK:vname[#rrggbb[aa][:legend]]]\n\n";
char help_tune1[] =
@@
-356,15
+361,15
@@
int main(int argc, char *argv[])
if ((myargv = (char **) malloc((argc+1) *
sizeof(char *))) == NULL) {
perror("malloc");
if ((myargv = (char **) malloc((argc+1) *
sizeof(char *))) == NULL) {
perror("malloc");
-
return -1
;
+
exit(1)
;
}
if ((argc=CreateArgs(argv[0], aLine, argc, myargv)) < 0) {
fprintf(stderr, "ERROR: creating arguments\n");
}
if ((argc=CreateArgs(argv[0], aLine, argc, myargv)) < 0) {
fprintf(stderr, "ERROR: creating arguments\n");
-
return -1
;
+
exit(1)
;
}
if (HandleInputLine(argc, myargv, stdout))
}
if (HandleInputLine(argc, myargv, stdout))
-
return -1
;
+
exit(1)
;
free(myargv);
#if HAVE_GETRUSAGE
free(myargv);
#if HAVE_GETRUSAGE
@@
-395,9
+400,7
@@
int main(int argc, char *argv[])
exit(0);
}
else {
exit(0);
}
else {
- if(HandleInputLine(argc, argv, stderr)) {
- return 1;
- }
+ exit(HandleInputLine(argc, argv, stderr));
}
return 0;
}
}
return 0;
}
@@
-546,7
+549,7
@@
int HandleInputLine(int argc, char **argv, FILE* out)
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
- printf("RRDtool 1.2rc
3
Copyright by Tobi Oetiker, 1997-2005\n");
+ printf("RRDtool 1.2rc
8
Copyright by Tobi Oetiker, 1997-2005\n");
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)