* introduce a new rrd_create_r2 call to fix the no-overwrite api mess

[rrdtool.git] / src / rrd_last.c

diff --git a/src/rrd_last.c b/src/rrd_last.c
index 517b65a..90bcae7 100644 (file)
--- a/src/rrd_last.c
+++ b/src/rrd_last.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.3.2  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3  Copyright by Tobi Oetiker, 1997-2010
  *****************************************************************************
  * rrd_last.c
  *****************************************************************************
@@ -14,7 +14,7 @@ time_t rrd_last(
     char **argv)
 {
     char *opt_daemon = NULL;
-    int status;
+    time_t lastupdate;
 
     optind = 0;
     opterr = 0;         /* initialize getopt */
@@ -58,11 +58,15 @@ time_t rrd_last(
         return (-1);
     }
 
-    status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
-    if (opt_daemon) free(opt_daemon);
-    if (status) return (-1);
+    rrdc_connect (opt_daemon);
+    if (rrdc_is_connected (opt_daemon))
+        lastupdate = rrdc_last (argv[optind]);
+
+    else
+        lastupdate = rrd_last_r(argv[optind]);
 
-    return (rrd_last_r (argv[optind]));
+    if (opt_daemon) free(opt_daemon);
+    return (lastupdate);
 }
 
 time_t rrd_last_r(
@@ -73,6 +77,7 @@ time_t rrd_last_r(
 
     rrd_t     rrd;
 
+    rrd_init(&rrd);
     rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
     if (rrd_file != NULL) {
         lastup = rrd.live_head->last_up;