Ensure that response_read() always calls fflush() or fclose().

[rrdtool.git] / src / rrd_first.c

diff --git a/src/rrd_first.c b/src/rrd_first.c
index 2ec522d..80b9e17 100644 (file)
--- a/src/rrd_first.c
+++ b/src/rrd_first.c
@@ -1,100 +1,117 @@
 /*****************************************************************************
- * RRDtool 1.2.17  Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.4.3  Copyright by Tobi Oetiker, 1997-2010
  *****************************************************************************
  * rrd_first Return
  *****************************************************************************
  * Initial version by Burton Strauss, ntopSupport.com - 3/2005
  *****************************************************************************/
 
+#include <stdlib.h>
 #include "rrd_tool.h"
+#include "rrd_client.h"
 
 
-time_t
-rrd_first(int argc, char **argv)
+time_t rrd_first(
+    int argc,
+    char **argv)
 {
-    int target_rraindex=0;
-    char *endptr;
-    optind = 0; opterr = 0;  /* initialize getopt */
+    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}
+    };
 
-    while (1){
-        static struct option long_options[] =
-        {
-            {"rraindex", required_argument, 0, 129},
-            {0,0,0,0}
-        };
-        int option_index = 0;
-        int opt;
-        opt = getopt_long(argc, argv, "", long_options, &option_index);
+    optind = 0;
+    opterr = 0;         /* initialize getopt */
 
-        if(opt == EOF)
+    while (1) {
+        int       option_index = 0;
+        int       opt;
+
+        opt = getopt_long(argc, argv, "d:F", long_options, &option_index);
+
+        if (opt == EOF)
             break;
 
-        switch(opt) {
-          case 129:
-            target_rraindex=strtol(optarg,&endptr,0);
-            if(target_rraindex < 0) {
+        switch (opt) {
+        case 129:
+            target_rraindex = strtol(optarg, &endptr, 0);
+            if (target_rraindex < 0) {
                 rrd_set_error("invalid rraindex number");
-                return(-1);
+                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", argv[0]);
-            return(-1);
+        default:
+            rrd_set_error("usage rrdtool %s [--rraindex number] [--daemon <addr>] file.rrd",
+                          argv[0]);
+            return (-1);
         }
     }
 
-    if(optind >= argc){
-        rrd_set_error("not enough arguments");
-        return -1;       
-    }     
+    if (optind >= argc) {
+        rrd_set_error("usage rrdtool %s [--rraindex number] [--daemon <addr>] file.rrd",
+                      argv[0]);
+        return -1;
+    }
 
-    return(rrd_first_r(argv[optind], target_rraindex));
+    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));
+       }
 }
 
 
-time_t
-rrd_first_r(const char *filename, const int rraindex)
+time_t rrd_first_r(
+    const char *filename,
+    const int rraindex)
 {
-    long rra_start,
-         timer;
-    time_t then;
-    FILE *in_file;
-    rrd_t rrd;
-
-    if(rrd_open(filename,&in_file,&rrd, RRD_READONLY)==-1){
-        rrd_set_error("could not open RRD");
-        return(-1);
+    off_t     rra_start, timer;
+    time_t    then = -1;
+    rrd_t     rrd;
+    rrd_file_t *rrd_file;
+
+    rrd_init(&rrd);
+    rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
+    if (rrd_file == NULL) {
+        goto err_free;
     }
 
-    if((rraindex < 0) || (rraindex >= (int)rrd.stat_head->rra_cnt)) {
+    if ((rraindex < 0) || (rraindex >= (int) rrd.stat_head->rra_cnt)) {
         rrd_set_error("invalid rraindex number");
-        rrd_free(&rrd);
-        fclose(in_file);
-        return(-1);
+        goto err_close;
     }
 
-    rra_start = ftell(in_file);    
-    fseek(in_file,
-          (rra_start +
-           (rrd.rra_ptr[rraindex].cur_row+1) *
-           rrd.stat_head->ds_cnt *
-           sizeof(rrd_value_t)),
-          SEEK_SET);
-    timer = - (rrd.rra_def[rraindex].row_cnt-1);
+    rra_start = rrd_file->header_len;
+    rrd_seek(rrd_file,
+             (rra_start +
+              (rrd.rra_ptr[rraindex].cur_row + 1) *
+              rrd.stat_head->ds_cnt * sizeof(rrd_value_t)), SEEK_SET);
+    timer = -(long)(rrd.rra_def[rraindex].row_cnt - 1);
     if (rrd.rra_ptr[rraindex].cur_row + 1 > rrd.rra_def[rraindex].row_cnt) {
-      fseek(in_file,rra_start,SEEK_SET);
+        rrd_seek(rrd_file, rra_start, SEEK_SET);
     }
     then = (rrd.live_head->last_up -
             rrd.live_head->last_up %
-            (rrd.rra_def[rraindex].pdp_cnt*rrd.stat_head->pdp_step)) +
-           (timer * 
-            rrd.rra_def[rraindex].pdp_cnt*rrd.stat_head->pdp_step);
-
+            (rrd.rra_def[rraindex].pdp_cnt * rrd.stat_head->pdp_step)) +
+        (timer * rrd.rra_def[rraindex].pdp_cnt * rrd.stat_head->pdp_step);
+  err_close:
+    rrd_close(rrd_file);
+  err_free:
     rrd_free(&rrd);
-    fclose(in_file);
-    return(then);
+    return (then);
 }
-
-
-
-