X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=5fcb4404e3a369c0305cde7e87653b34dbab8c93;hb=298b318acaf1147474ab9e97cac37c3608660efd;hp=41cf3cde0376f763e0f596eb714f018fbc762788;hpb=5c240077e0a6f12a27972a13ba3f694c2989ba35;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 41cf3cd..5fcb440 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -253,7 +253,9 @@ int main(int argc, char *argv[])
 {
     char **myargv;
     char aLine[MAX_LENGTH];
+#ifdef HAVE_CHROOT    
     char *firstdir="";
+#endif
 #ifdef MUST_DISABLE_SIGFPE
     signal(SIGFPE,SIG_IGN);
 #endif
@@ -279,7 +281,7 @@ int main(int argc, char *argv[])
 	    gettimeofday(&starttime,&tz);
 #endif
 	  RemoteMode=1;
-#ifndef WIN32
+#ifdef HAVE_CHROOT
           if ((argc == 3) && strcmp("",argv[2])){
              if (getuid()==0){
                 chroot(argv[2]);
@@ -303,8 +305,8 @@ int main(int argc, char *argv[])
              }
           }
 #else
-          fprintf(stderr,"ERROR: change root only in unix "
-                         "enviroment posible\n");
+          fprintf(stderr,"ERROR: change root is not supported by your OS "
+                         "or at least by this copy of rrdtool\n");
           exit(1);
 #endif
 
@@ -358,11 +360,17 @@ int main(int argc, char *argv[])
     return 0;
 }
 
+/* HandleInputLine is NOT thread safe - due to readdir issues,
+   resolving them portably is not really simple. */
 int HandleInputLine(int argc, char **argv, FILE* out)
 {
+#if defined(HAVE_OPENDIR) && defined (HAVE_READDIR)
     DIR           *curdir; /* to read current dir with ls */
     struct dirent *dent;
+#endif
+#if defined(HAVE_SYS_STAT_H)
     struct stat   st;
+#endif
     optind=0; /* reset gnu getopt */
     opterr=0; /* no error messages */
 
@@ -374,12 +382,13 @@ int HandleInputLine(int argc, char **argv, FILE* out)
           }
           exit(0);
        }
+#if defined(HAVE_OPENDIR) && defined(HAVE_READDIR) && defined(HAVE_CHDIR)
        if (argc>1 && strcmp("cd", argv[1]) == 0){
           if (argc>3){
              printf("ERROR: invalid parameter count for cd\n");
              return(0);
           }
-#ifndef WIN32
+#if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){
              printf("ERROR: chdir security problem - rrdtool is runnig as "
                     "root an no chroot!\n");
@@ -397,7 +406,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
              printf("ERROR: invalid parameter count for mkdir\n");
              return(0);
           }
-#ifndef WIN32
+#if ! defined(HAVE_CHROOT) || ! defined(HAVE_GETUID)
           if (getuid()==0 && ! ChangeRoot){
              printf("ERROR: mkdir security problem - rrdtool is runnig as "
                     "root an no chroot!\n");
@@ -422,8 +431,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
                       printf("d %s\n",dent->d_name);
                    }
                    if (strlen(dent->d_name)>4 && S_ISREG(st.st_mode)){
-                      if (!strcmp(dent->d_name+strlen(dent->d_name)-4,".rrd") ||
-                          !strcmp(dent->d_name+strlen(dent->d_name)-4,".RRD")){
+                      if (!strcmp(dent->d_name+NAMLEN(dent)-4,".rrd") ||
+                          !strcmp(dent->d_name+NAMLEN(dent)-4,".RRD")){
                          printf("- %s\n",dent->d_name);
                       }
                    }
@@ -436,6 +445,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
           }
           return(0);
        }
+#endif /* opendir and readdir */
+
     }
     if (argc < 3 
 	|| strcmp("help", argv[1]) == 0
@@ -496,7 +507,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
     else if (strcmp("update", argv[1]) == 0)
 	rrd_update(argc-1, &argv[1]);
     else if (strcmp("fetch", argv[1]) == 0) {
-	time_t        start,end;
+	time_t        start,end, ti;
 	unsigned long step, ds_cnt,i,ii;
 	rrd_value_t   *data,*datai;
 	char          **ds_namv;
@@ -506,8 +517,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	    for (i = 0; i<ds_cnt;i++)
 	        printf("%14s",ds_namv[i]);
 	    printf ("\n\n");
-	    for (i = start+step; i <= end; i += step){
-	        printf("%10lu:", i);
+	    for (ti = start+step; ti <= end; ti += step){
+	        printf("%10lu:", ti);
 	        for (ii = 0; ii < ds_cnt; ii++)
 		    printf(" %0.10e", *(datai++));
 	        printf("\n");
@@ -519,8 +530,8 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	}
     } else if (strcmp("xport", argv[1]) == 0) {
 	int xxsize;
-	int i = 0, j = 0;
-	time_t        start,end;
+	unsigned long int j = 0;
+	time_t        start,end, ti;
 	unsigned long step, col_cnt,row_cnt;
 	rrd_value_t   *data,*ptr;
 	char          **legend_v;
@@ -546,9 +557,9 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	  printf("    </%s>\n", LEGEND_TAG);
 	  printf("  </%s>\n", META_TAG);
 	  printf("  <%s>\n", DATA_TAG);
-	  for (i = start+step; i <= end; i += step) {
+	  for (ti = start+step; ti <= end; ti += step) {
 	    printf ("    <%s>", DATA_ROW_TAG);
-	    printf ("<%s>%lu</%s>", COL_TIME_TAG, i, COL_TIME_TAG);
+	    printf ("<%s>%lu</%s>", COL_TIME_TAG, ti, COL_TIME_TAG);
 	    for (j = 0; j < col_cnt; j++) {
 	      rrd_value_t newval = DNAN;
 	      newval = *ptr;