X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Frrd_tool.c;h=dd3f0f9197e1b266bfdbfad6a9103c91c39a68bc;hb=87bfb3981c5c5bbf5843144a1d94c4011043592d;hp=3f26a701e0c0d20cf805546e2dd075a30e197784;hpb=927b7f2bd51f965cd72325f54d68b1d4ee748312;p=rrdtool.git

diff --git a/src/rrd_tool.c b/src/rrd_tool.c
index 3f26a70..dd3f0f9 100644
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.11  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_tool.c  Startup wrapper
  *****************************************************************************/
@@ -22,7 +22,7 @@ void PrintUsage(char *cmd)
 {
 
     char help_main[] =
-	   "RRDtool " PACKAGE_VERSION "  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
+	   "RRDtool " PACKAGE_VERSION "  Copyright 1997-2006 by Tobias Oetiker <tobi@oetiker.ch>\n"
            "               Compiled " __DATE__ " " __TIME__ "\n\n"
 	   "Usage: rrdtool [options] command command_options\n\n";
 
@@ -114,9 +114,10 @@ void PrintUsage(char *cmd)
 	   "\t\t[-f|--imginfo printfstr]\n"
 	   "\t\t[-a|--imgformat PNG]\n"
 	   "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n"
-	   "\t\t[DEF:vname=rrd:ds-name:CF]\n"
-	   "\t\t[CDEF:vname=rpn-expression]\n";
+	   "\t\t[-W|--watermark string]\n"
+	   "\t\t[DEF:vname=rrd:ds-name:CF]\n";
     char help_graph3[] =
+	   "\t\t[CDEF:vname=rpn-expression]\n"
 	   "\t\t[VDEF:vdefname=rpn-expression]\n"
 	   "\t\t[PRINT:vdefname:format]\n"
 	   "\t\t[GPRINT:vdefname:format]\n"
@@ -326,7 +327,15 @@ int main(int argc, char *argv[])
 #endif
 	  RemoteMode=1;
           if ((argc == 3) && strcmp("",argv[2])){
-             if (getuid()==0){
+
+             if (
+#ifdef HAVE_GETUID
+		 getuid()
+#else
+		 1
+#endif
+		 == 0 ){
+
 #ifdef HAVE_CHROOT
                 chroot(argv[2]);
                 if (errno!=0){
@@ -355,7 +364,7 @@ int main(int argc, char *argv[])
 
 	    while (fgets(aLine, sizeof(aLine)-1, stdin)){
 		if ((argc = CountArgs(aLine)) == 0)  {
-		    fprintf(stderr,"ERROR: not enough arguments\n");
+		    printf("ERROR: not enough arguments\n");
 		}
 		if ((myargv = (char **) malloc((argc+1) * 
 					       sizeof(char *))) == NULL)   {
@@ -435,7 +444,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 #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");
+                    "root but not chroot!\n");
              return(1); 
           }
 #endif
@@ -454,7 +463,7 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 #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");
+                    "root but not chroot!\n");
              return(1); 
           }
 #endif
@@ -642,8 +651,15 @@ int HandleInputLine(int argc, char **argv, FILE* out)
 	double ymin,ymax;
 	int i;
 	int tostdout = (strcmp(argv[2],"-") == 0);	
+	int imginfo = 0;
+	for (i=2;i<argc;i++){
+		if (strcmp(argv[i],"--imginfo") == 0 || strcmp(argv[i],"-f") == 0){
+			imginfo = 1;
+			break;
+		}
+	}
 	if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize, NULL, &ymin, &ymax) != -1 ) {
-	    if (!tostdout) 
+	    if (!tostdout && !imginfo) 
 		printf ("%dx%d\n",xsize,ysize);
 	    if (calcpr) {
 		for(i=0;calcpr[i];i++){