X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_first.c;h=80b9e17df6113d28b8114baa13dfa70132e67187;hp=15810a63d8e3f8edf305b73311494f0d5a87ec46;hb=96b0f4aace0deef034a792a08dc2d426cd2b61a4;hpb=2a9b0ff9cf29cf82b7b12ea80889c59273d66008 diff --git a/src/rrd_first.c b/src/rrd_first.c index 15810a6..80b9e17 100644 --- a/src/rrd_first.c +++ b/src/rrd_first.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.4.2 Copyright by Tobi Oetiker, 1997-2009 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 ***************************************************************************** * rrd_first Return ***************************************************************************** @@ -8,6 +8,7 @@ #include #include "rrd_tool.h" +#include "rrd_client.h" time_t rrd_first( @@ -16,8 +17,10 @@ time_t rrd_first( { int target_rraindex = 0; char *endptr; + char *opt_daemon = NULL; struct option long_options[] = { {"rraindex", required_argument, 0, 129}, + {"daemon", required_argument, 0, 'd'}, {0, 0, 0, 0} }; @@ -28,7 +31,7 @@ time_t rrd_first( int option_index = 0; int opt; - opt = getopt_long(argc, argv, "", long_options, &option_index); + opt = getopt_long(argc, argv, "d:F", long_options, &option_index); if (opt == EOF) break; @@ -41,19 +44,35 @@ time_t rrd_first( return (-1); } break; + case 'd': + if (opt_daemon != NULL) + free (opt_daemon); + opt_daemon = strdup (optarg); + if (opt_daemon == NULL) + { + rrd_set_error ("strdup failed."); + return (-1); + } + break; default: - rrd_set_error("usage rrdtool %s [--rraindex number] file.rrd", + rrd_set_error("usage rrdtool %s [--rraindex number] [--daemon ] file.rrd", argv[0]); return (-1); } } if (optind >= argc) { - rrd_set_error("not enough arguments"); + rrd_set_error("usage rrdtool %s [--rraindex number] [--daemon ] file.rrd", + argv[0]); return -1; } + rrdc_connect (opt_daemon); + if (rrdc_is_connected (opt_daemon)) { + return (rrdc_first (argv[optind], target_rraindex)); + } else { return (rrd_first_r(argv[optind], target_rraindex)); + } }