X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=f1eb11618e18b5a4b98dc8b01ddcd0233d675692;hb=cd5224435747949630ffdd2486442e05a621c670;hp=9e49fcc6d3fcaf6f6771b63dd02e8968145e4762;hpb=734468bcc23497c7eba0deba87c92aa219fd46d1;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 9e49fcc..f1eb116 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.17  Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.2.23  Copyright by Tobi Oetiker, 1997-2007
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -22,14 +22,14 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool " PACKAGE_VERSION "  Copyright 1997-2006 by Tobias Oetiker <tobi@oetiker.ch>\n"
+	   "RRDtool " PACKAGE_VERSION "  Copyright 1997-2007 by Tobias Oetiker <tobi@oetiker.ch>\n"
            "               Compiled " __DATE__ " " __TIME__ "\n\n"
 	   "Usage: rrdtool [options] command command_options\n\n";
 
     char help_list[] =
 	   "Valid commands: create, update, updatev, graph, dump, restore,\n"
 	   "\t\tlast, lastupdate, first, info, fetch, tune,\n"
-	   " resize, xport\n\n";
+	   "\t\tresize, xport\n\n";
 
     char help_listremote[] =
            "Valid remote commands: quit, ls, cd, mkdir, pwd\n\n";
@@ -364,11 +364,8 @@ int main(int argc, char *argv[])
 	  struct rusage  myusage;
 	  struct timeval starttime;
 	  struct timeval currenttime;
-	  struct timezone tz;
 
-	    tz.tz_minuteswest =0;
-	    tz.tz_dsttime=0;
-	    gettimeofday(&starttime,&tz);
+	  gettimeofday(&starttime, NULL);
 #endif
 	  RemoteMode=1;
           if ((argc == 3) && strcmp("",argv[2])){
@@ -426,7 +423,7 @@ int main(int argc, char *argv[])
 
 #if HAVE_GETRUSAGE
  		     getrusage(RUSAGE_SELF,&myusage);
-		     gettimeofday(&currenttime,&tz);
+		     gettimeofday(&currenttime,NULL);
 		     printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
 		       (double)myusage.ru_utime.tv_sec+
 		       (double)myusage.ru_utime.tv_usec/1000000.0,
@@ -689,8 +686,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	char          **legend_v;
         int           enumds = 0;
         int           i;
-        char *vtag = NULL;
-        vtag = malloc( strlen(COL_DATA_TAG)+10);
+        size_t       vtag_s = strlen(COL_DATA_TAG) + 10; 
+        char         *vtag = malloc(vtag_s); 
 	for ( i = 2; i < argc; i++){
 		if (strcmp("--enumds", argv[i]) == 0)
 			enumds = 1;
@@ -724,9 +721,9 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	    for (j = 0; j < col_cnt; j++) {
 	      rrd_value_t newval = DNAN;
               if (enumds == 1)
-		snprintf(vtag,15,"%s%lu", COL_DATA_TAG, j);
+		snprintf(vtag,vtag_s,"%s%lu", COL_DATA_TAG, j);
 	      else
-		snprintf(vtag,15,"%s",COL_DATA_TAG);
+		snprintf(vtag,vtag_s,"%s",COL_DATA_TAG);
               
 	      newval = *ptr;
 	      if(isnan(newval)){