X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=ecd88f975b1e18a1a26be9059b995696ad740f6b;hb=8b72aa265bde592af7e13220a3484c5657d6ffaf;hp=f3b73415fd82c6e50efe9905c7c4b7c285df1837;hpb=37329a5f991870e8f47c8a52f6dd594fef813de6;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index f3b7341..ecd88f9 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.6  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.11  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -22,8 +22,8 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool 1.2.6  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+	   "RRDtool " PACKAGE_VERSION "  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"
@@ -81,7 +81,7 @@ void PrintUsage(char *cmd)
 	   "\t\ttime|N:value[:value...]\n\n"
            "\t\tat-time@value[:value...]\n\n"
  	   "\t\t[ time:value[:value...] ..]\n\n";
-
+ 
     char help_fetch[] =
 	   "* fetch - fetch data out of an RRD\n\n"
 	   "\trrdtool fetch filename.rrd CF\n"
@@ -370,17 +370,17 @@ int main(int argc, char *argv[])
 		    exit(1);
 		}
 		if ((argc=CreateArgs(argv[0], aLine, argc, myargv)) < 0) {
-		    fprintf(stderr, "ERROR: creating arguments\n");
-		    exit(1);
-		}
-
-		HandleInputLine(argc, myargv, stdout);
-		free(myargv);
+		    printf("ERROR: creating arguments\n");
+		} else {
+	 	    int ret = HandleInputLine(argc, myargv, stdout);
+ 		    free(myargv);
+ 		    if (ret == 0){
+ 		    	
 
 #if HAVE_GETRUSAGE
-		getrusage(RUSAGE_SELF,&myusage);
-		gettimeofday(&currenttime,&tz);
-		printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
+ 		     getrusage(RUSAGE_SELF,&myusage);
+		     gettimeofday(&currenttime,&tz);
+		     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,
 		       (double)myusage.ru_stime.tv_sec+
@@ -389,8 +389,11 @@ int main(int argc, char *argv[])
 		       +(double)(currenttime.tv_usec-starttime.tv_usec)
 		       /1000000.0);
 #else
-		printf("OK\n");
-#endif
+		      printf("OK\n");
+		    
+#endif          
+		  }
+		}
 		fflush(stdout); /* this is important for pipes to work */
 	    }
 	}
@@ -426,7 +429,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
        if (argc>1 && strcmp("quit", argv[1]) == 0){
           if (argc>2){
              printf("ERROR: invalid parameter count for quit\n");
-             return(0);
+             return(1);
           }
           exit(0);
        }
@@ -434,43 +437,45 @@ int HandleInputLine(int argc, char **argv, FILE* out)
        if (argc>1 && strcmp("cd", argv[1]) == 0){
           if (argc>3){
              printf("ERROR: invalid parameter count for cd\n");
-             return(0);
+             return(1);
           }
 #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){
              printf("ERROR: chdir security problem - rrdtool is running as "
                     "root an no chroot!\n");
-             return(0); 
+             return(1); 
           }
 #endif
           chdir(argv[2]);
           if (errno!=0){
              printf("ERROR: %s\n",rrd_strerror(errno));
+	     return(1);
           }
           return(0);
        }
        if (argc>1 && strcmp("mkdir", argv[1]) == 0){
           if (argc>3){
              printf("ERROR: invalid parameter count for mkdir\n");
-             return(0);
+             return(1);
           }
 #if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){
              printf("ERROR: mkdir security problem - rrdtool is running as "
                     "root an no chroot!\n");
-             return(0); 
+             return(1); 
           }
 #endif
           mkdir(argv[2],0777);
           if (errno!=0){
              printf("ERROR: %s\n",rrd_strerror(errno));
+             return(1);
           }
           return(0);
        }
        if (argc>1 && strcmp("ls", argv[1]) == 0){
           if (argc>2){
              printf("ERROR: invalid parameter count for ls\n");
-             return(0);
+             return(1);
           }
           if ((curdir=opendir("."))!=NULL){
              while((dent=readdir(curdir))!=NULL){
@@ -552,7 +557,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	     strcmp("v", argv[1]) == 0 ||
 	     strcmp("-v", argv[1]) == 0  ||
 	     strcmp("-version", argv[1]) == 0  )
-        printf("RRDtool 1.2.6  Copyright by Tobi Oetiker, 1997-2005\n");
+        printf("RRDtool " PACKAGE_VERSION "  Copyright by Tobi Oetiker, 1997-2005 (%f)\n",
+               rrd_version());
     else if (strcmp("restore", argv[1]) == 0)
 	rrd_restore(argc-1, &argv[1]);
     else if (strcmp("resize", argv[1]) == 0)