/*****************************************************************************
- * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2004
+ * RRDtool 1.2rc8 Copyright by Tobi Oetiker, 1997-2005
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
{
char help_main[] =
- "RRDtool 1.1.x Copyright 1997-2004 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"
+#else
+ " Compiled " MAKE_TIMESTAMP "\n\n"
#endif
"Usage: rrdtool [options] command command_options\n\n";
char help_list[] =
"Valid commands: create, update, updatev, graph, dump, restore,\n"
- "\t\tlast, info, fetch, tune, resize, xport\n\n";
+ "\t\tlast, first, info, fetch, tune, resize, xport\n\n";
char help_listremote[] =
"Valid remote commands: quit, ls, cd, mkdir\n\n";
"* last - show last update time for RRD\n\n"
"\trrdtool last filename.rrd\n\n";
+ char help_first[] =
+ "* first - show first update time for RRA within an RRD\n\n"
+ "\trrdtool first filename.rrd [--rraindex number]\n\n";
+
char help_update[] =
"* update - update an RRD\n\n"
"\trrdtool update filename\n"
"\t\t[-h|--height pixels] [-o|--logarithmic]\n"
"\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
- "\t\t[-g|--no-legend]\n";
+ "\t\t[-g|--no-legend]\n"
+ "\t\t[-F|--force-rules-legend]\n";
char help_graph2[] =
"\t\t[-j|--only-graph]\n"
"\t\t[--font FONTTAG:size:font]\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"
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: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[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[] =
"For more information read the RRD manpages\n\n";
- enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST,
+ enum { C_NONE, C_CREATE, C_DUMP, C_INFO, C_RESTORE, C_LAST, C_FIRST,
C_UPDATE, C_FETCH, C_GRAPH, C_TUNE, C_RESIZE, C_XPORT,
C_QUIT, C_LS, C_CD, C_MKDIR, C_UPDATEV };
help_cmd = C_RESTORE;
else if (!strcmp(cmd,"last"))
help_cmd = C_LAST;
+ else if (!strcmp(cmd,"first"))
+ help_cmd = C_FIRST;
else if (!strcmp(cmd,"update"))
help_cmd = C_UPDATE;
else if (!strcmp(cmd,"updatev"))
case C_LAST:
fputs(help_last, stdout);
break;
+ case C_FIRST:
+ fputs(help_first, stdout);
+ break;
case C_UPDATE:
fputs(help_update, stdout);
break;
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");
- return -1;
+ exit(1);
}
if (HandleInputLine(argc, myargv, stdout))
- return -1;
+ exit(1);
free(myargv);
#if HAVE_GETRUSAGE
PrintUsage(argv[2]);
exit(0);
}
- else
- HandleInputLine(argc, argv, stderr);
+ else {
+ exit(HandleInputLine(argc, argv, stderr));
+ }
return 0;
}
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
- printf("RRDtool 1.1.x Copyright (C) 1997-2004 by Tobias Oetiker <tobi@oetiker.ch>\n");
+ printf("RRDtool 1.2rc8 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)
rrd_resize(argc-1, &argv[1]);
else if (strcmp("last", argv[1]) == 0)
- printf("%ld\n",rrd_last(argc-1, argv[1]));
+ printf("%ld\n",rrd_last(argc-1, &argv[1]));
+ else if (strcmp("first", argv[1]) == 0)
+ printf("%ld\n",rrd_first(argc-1, &argv[1]));
else if (strcmp("update", argv[1]) == 0)
rrd_update(argc-1, &argv[1]);
else if (strcmp("fetch", argv[1]) == 0) {
const char *imgfile = argv[2]; /* rrd_graph changes argv pointer */
#endif
int xsize, ysize;
+ double ymin,ymax;
int i;
int tostdout = (strcmp(argv[2],"-") == 0);
- if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL) != -1 ) {
+ if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) {
if (!tostdout)
printf ("%dx%d\n",xsize,ysize);
if (calcpr) {
if (rrd_test_error()) {
fprintf(out, "ERROR: %s\n",rrd_get_error());
rrd_clear_error();
+ return 1;
}
return(0);
}