X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=1994bb91e0296455f3df6c453ce6cfd90311732b;hb=97939155f7c748cd3729dd5f4e1b6707a82a817c;hp=cdd78887145d677f7e6e4a6893cbc53ce4a2f4a8;hpb=aa4d951ab71eb7fe57840c3baaddf36809806aef;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index cdd7888..1994bb9 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.10  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.11  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -23,11 +23,7 @@ void PrintUsage(char *cmd)
 
     char help_main[] =
 	   "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"
-#endif          
 	   "Usage: rrdtool [options] command command_options\n\n";
 
     char help_list[] =
@@ -331,9 +327,9 @@ int main(int argc, char *argv[])
 	    gettimeofday(&starttime,&tz);
 #endif
 	  RemoteMode=1;
-#ifdef HAVE_CHROOT
           if ((argc == 3) && strcmp("",argv[2])){
              if (getuid()==0){
+#ifdef HAVE_CHROOT
                 chroot(argv[2]);
                 if (errno!=0){
                    fprintf(stderr,"ERROR: can't change root to '%s' errno=%d\n",
@@ -342,8 +338,12 @@ int main(int argc, char *argv[])
                 }
                 ChangeRoot=1;
                 firstdir="/";
-             }
-             else{
+#else
+                fprintf(stderr,"ERROR: change root is not supported by your OS "
+                         "or at least by this copy of rrdtool\n");
+                exit(1);
+#endif
+             } else {
                 firstdir=argv[2];
              }
           }
@@ -354,11 +354,6 @@ int main(int argc, char *argv[])
                 exit(errno);
              }
           }
-#else
-          fprintf(stderr,"ERROR: change root is not supported by your OS "
-                         "or at least by this copy of rrdtool\n");
-          exit(1);
-#endif
 
 	    while (fgets(aLine, sizeof(aLine)-1, stdin)){
 		if ((argc = CountArgs(aLine)) == 0)  {
@@ -370,17 +365,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 +384,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 +424,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 +432,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){