X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph_helper.c;h=6028b01b6f4bbe6c6443891aa874f39090384e9c;hb=361a0fd38d7adf95847508f54c0bde9b3f98662e;hp=ef1e8e747bb2b6c18ef85dc656fbcdcea98ea388;hpb=e59507fce724b583cf9ab2c402907bd2c9d3f91e;p=rrdtool.git

diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index ef1e8e7..6028b01 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -1,12 +1,43 @@
+/****************************************************************************
+ * RRDtool 1.2.8  Copyright by Tobi Oetiker, 1997-2005
+ ****************************************************************************
+ * rrd_graph_helper.c  commandline parser functions 
+ *                     this code initially written by Alex van den Bogaerdt
+ ****************************************************************************/
+
 #include "rrd_graph.h"
 
 #define dprintf if (gdp->debug) printf
 
+/* Define prototypes for the parsing methods.
+  Inputs:
+   char *line         - pointer to base of input source
+   unsigned int eaten - index to next input character (INPUT/OUTPUT)
+   graph_desc_t *gdp  - pointer to a graph description
+   image_desc_t *im   - pointer to an image description
+*/
+
+int rrd_parse_find_gf (char *, unsigned int *, graph_desc_t *);
+int rrd_parse_legend  (char *, unsigned int *, graph_desc_t *);
+int rrd_parse_color   (char *, graph_desc_t *);
+int rrd_parse_CF      (char *, unsigned int *, graph_desc_t *, enum cf_en *);
+int rrd_parse_print   (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+int rrd_parse_shift   (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+int rrd_parse_xport   (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+int rrd_parse_PVHLAST (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+int rrd_parse_vname   (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+int rrd_parse_def     (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+int rrd_parse_vdef    (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+int rrd_parse_cdef    (char *, unsigned int *, graph_desc_t *, image_desc_t *);
+
+
+
 int
 rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) {
-    char funcname[11],c1=0,c2=0;
+    char funcname[11],c1=0;
     int i=0;
 
+    /* start an argument with DEBUG to be able to see how it is parsed */
     sscanf(&line[*eaten], "DEBUG%n", &i);
     if (i) {
 	gdp->debug=1;
@@ -14,7 +45,7 @@ rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) {
 	i=0;
 	dprintf("Scanning line '%s'\n",&line[*eaten]);
     }
-    sscanf(&line[*eaten], "%10[A-Z]%n%c%c", funcname, &i, &c1, &c2);
+    sscanf(&line[*eaten], "%10[A-Z]%n%c", funcname, &i, &c1);
     if (!i) {
 	rrd_set_error("Could not make sense out of '%s'",line);
 	return 1;
@@ -22,21 +53,36 @@ rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) {
     if ((int)(gdp->gf=gf_conv(funcname)) == -1) {
 	rrd_set_error("'%s' is not a valid function name", funcname);
 	return 1;
+    } else {
+	dprintf("- found function name '%s'\n",funcname);
     }
+
     if (gdp->gf == GF_LINE) {
-	if (c1 < '1' || c1 > '3' || c2 != ':') {
-	    rrd_set_error("Malformed LINE command: %s",line);
-	    return 1;
+	if (c1 == ':') {
+	    gdp->linewidth=1;
+	    dprintf("- - using default width of 1\n");
+	} else {
+	    double width;
+	    (*eaten)+=i;
+	    if (sscanf(&line[*eaten],"%lf%n:",&width,&i)) {
+		if (width < 0 || isnan(width) || isinf(width) ) {
+		    rrd_set_error("LINE width is %lf. It must be finite and >= 0 though",width);
+		    return 1;
+		}
+		gdp->linewidth=width;
+		dprintf("- - using width %f\n",width);
+	    } else {
+		rrd_set_error("LINE width: %s",line);
+		return 1;
+	    }
 	}
-	gdp->linewidth=c1-'0';
-	i++;
     } else {
 	if (c1 != ':') {
 	    rrd_set_error("Malformed %s command: %s",funcname,line);
 	    return 1;
 	}
     }
-    *eaten+=++i;
+    (*eaten)+=++i;
     return 0;
 }
 
@@ -44,50 +90,73 @@ int
 rrd_parse_legend(char *line, unsigned int *eaten, graph_desc_t *gdp) {
     int i;
 
-    dprintf("- examining '%s'\n",&line[*eaten]);
+    if (line[*eaten]=='\0' || line[*eaten]==':') {
+	dprintf("- no (or: empty) legend found\n");
+	return 0;
+    }
 
     i=scan_for_col(&line[*eaten],FMT_LEG_LEN,gdp->legend);
 
-    *eaten += i;
+    (*eaten)+=i;
+
     if (line[*eaten]!='\0' && line[*eaten]!=':') {
 	rrd_set_error("Legend too long");
 	return 1;
     } else {
-	dprintf("- found legend '%s'\n", gdp->legend);
 	return 0;
     }
 }
 
 int
 rrd_parse_color(char *string, graph_desc_t *gdp) {
-    unsigned int r=0,g=0,b=0,a=0;
-    int i1=0,i2=0,i3=0;
+    unsigned int r=0,g=0,b=0,a=0,i;
 
-    if (string[0] != '#') return 1;
-    sscanf(string, "#%02x%02x%02x%n%02x%n%*s%n",
-				&r,&g,&b,&i1,&a,&i2,&i3);
+    /* matches the following formats:
+    ** RGB
+    ** RGBA
+    ** RRGGBB
+    ** RRGGBBAA
+    */
 
-    if (i3) return 1; /* garbage after color */
-    if (!i2) a=0xFF;
-    if (!i1) return 1; /* no color after '#' */
+    i=0;
+    while (string[i] && isxdigit(string[i])) i++;
+    if (string[i] != '\0') return 1; /* garbage follows hexdigits */
+    switch (i) {
+	case 3:
+	case 4:
+	    sscanf(string, "%1x%1x%1x%1x",&r,&g,&b,&a);
+	    r *= 0x11;
+	    g *= 0x11;
+	    b *= 0x11;
+	    a *= 0x11;
+	    if (i==3) a=0xFF;
+	    break;
+	case 6:
+	case 8:
+	    sscanf(string, "%02x%02x%02x%02x",&r,&g,&b,&a);
+	    if (i==6) a=0xFF;
+	    break;
+	default:
+	    return 1;	/* wrong number of digits */
+    }
     gdp->col = r<<24|g<<16|b<<8|a;
     return 0;
 }
 
 int
-rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp) {
+rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp, enum cf_en *cf) {
     char 		symname[CF_NAM_SIZE];
     int			i=0;
 
     sscanf(&line[*eaten], CF_NAM_FMT "%n", symname,&i);
-    if ((!i)||((line[*eaten+i]!='\0')&&(line[*eaten+i]!=':'))) {
+    if ((!i)||((line[(*eaten)+i]!='\0')&&(line[(*eaten)+i]!=':'))) {
 	rrd_set_error("Cannot parse CF in '%s'",line);
 	return 1;
     }
     (*eaten)+=i;
     dprintf("- using CF '%s'\n",symname);
 
-    if ((int)(gdp->cf = cf_conv(symname))==-1) {
+    if ((int)(*cf = cf_conv(symname))==-1) {
 	rrd_set_error("Unknown CF '%s' in '%s'",symname,line);
 	return 1;
     }
@@ -122,7 +191,7 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 	case GF_DEF:
 	case GF_CDEF:
 	    dprintf("- vname is of type DEF or CDEF, looking for CF\n");
-	    if (rrd_parse_CF(line,eaten,gdp)) return 1;
+	    if (rrd_parse_CF(line,eaten,gdp,&gdp->cf)) return 1;
 	    break;
 	case GF_VDEF:
 	    dprintf("- vname is of type VDEF\n");
@@ -133,19 +202,88 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
     }
 
     if (rrd_parse_legend(line,eaten,gdp)) return 1;
-
-    /* Why is there a separate structure member "format" ??? */
+    /* for *PRINT the legend itself gets rendered later. We only
+       get the format at this juncture */
     strcpy(gdp->format,gdp->legend);
-
+    gdp->legend[0]='\0';	
     return 0;
 }
 
+int
+rrd_parse_shift(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+	char	*l = strdup(line + *eaten), *p;
+	int	rc = 1;
+
+	p = strchr(l, ':');
+	if (p == NULL) {
+		rrd_set_error("Invalid SHIFT syntax");
+		goto out;
+	}
+	*p++ = '\0';
+	
+	if ((gdp->vidx=find_var(im,l))<0) {
+		rrd_set_error("Not a valid vname: %s in line %s",l,line);
+		goto out;
+	}
+	
+        /* constant will parse; otherwise, must be VDEF reference */
+	if (sscanf(p, "%ld", &gdp->shval) != 1) {
+		graph_desc_t	*vdp;
+		
+		if ((gdp->shidx=find_var(im, p))<0) {
+			rrd_set_error("invalid offset vname: %s", p);
+			goto out;
+		}
+		
+		vdp = &im->gdes[gdp->shidx];
+		if (vdp->gf != GF_VDEF) {
+			rrd_set_error("offset must specify value or VDEF");
+			goto out;
+		}
+	} else {
+		gdp->shidx = -1;
+	}
+	
+	*eaten = strlen(line);
+	rc = 0;
+
+ out:
+	free(l);
+	return rc;
+}
+
+int
+rrd_parse_xport(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+	char	*l = strdup(line + *eaten), *p;
+	int	rc = 1;
+
+	p = strchr(l, ':');
+	if (p != NULL)
+		*p++ = '\0';
+	else
+		p = "";
+	
+	if ((gdp->vidx=find_var(im, l))==-1){
+		rrd_set_error("unknown variable '%s'",l);
+		goto out;
+	}
+	
+	if (strlen(p) >= FMT_LEG_LEN)
+		*(p + FMT_LEG_LEN) = '\0';
+	
+	strcpy(gdp->legend, p);
+	*eaten = strlen(line);
+	rc = 0;
+	
+ out:
+	free(l);
+	return rc;
+}
+
 /* Parsing of PART, VRULE, HRULE, LINE, AREA, STACK and TICK
-** is done in one function.  Stacking STACK is silently ignored
-** as it is redundant.  Stacking PART, VRULE, HRULE or TICK is
-** not allowed.  The check for color doesn't need to be so strict
-** anymore, the user can specify the color '#00000000' and
-** effectively circumvent this check, so why bother.
+** is done in one function.
+**
+** Stacking PART, VRULE, HRULE or TICK is not allowed.
 **
 ** If a number (which is valid to enter) is more than a
 ** certain amount of characters, it is caught as an error.
@@ -154,12 +292,31 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 */
 int
 rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
-    int i,j;
+    int i,j,k;
     int colorfound=0;
     char tmpstr[MAX_VNAME_LEN + 10];	/* vname#RRGGBBAA\0 */
+    static int spacecnt = 0;
+
+    if (spacecnt == 0) {        
+	float one_space = gfx_get_text_width(im->canvas, 0,
+                               im->text_prop[TEXT_PROP_LEGEND].font,
+                               im->text_prop[TEXT_PROP_LEGEND].size,
+                               im->tabwidth,"    ", 0) / 4.0;
+	float target_space = gfx_get_text_width(im->canvas, 0,
+                               im->text_prop[TEXT_PROP_LEGEND].font,
+                               im->text_prop[TEXT_PROP_LEGEND].size,
+                               im->tabwidth,"oo", 0);
+	spacecnt =  target_space / one_space;	
+        dprintf("- spacecnt: %i onespace: %f targspace: %f\n",spacecnt,one_space,target_space);
+    }
+
 
     dprintf("- parsing '%s'\n",&line[*eaten]);
-    dprintf("- from line '%s'\n",line);
+
+    /* have simpler code in the drawing section */
+    if ( gdp->gf == GF_STACK ){
+	    gdp->stack=1;
+    }
 
     i=scan_for_col(&line[*eaten],MAX_VNAME_LEN+9,tmpstr);
     if (line[*eaten+i]!='\0' && line[*eaten+i]!=':') {
@@ -169,93 +326,153 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
 
     j=i; while (j>0 && tmpstr[j]!='#') j--;
 
-    if (tmpstr[j]=='#') {
-	if (rrd_parse_color(&tmpstr[j],gdp)) {
-	    rrd_set_error("Could not parse color in '%s'",tmpstr[j]);
-	    return 1;
-	}
+    if (j) {
 	tmpstr[j]='\0';
-	dprintf("- parsed color 0x%08x\n",(unsigned int)gdp->col);
-	colorfound=1;
     }
 
-    dprintf("- examining '%s'\n",tmpstr);
-    j=0;
+    dprintf("- examining value '%s'\n",tmpstr);
+    k=0;
     if (gdp->gf == GF_VRULE) {
-	sscanf(tmpstr,"%li%n",&gdp->xrule,&j);
-	if (j) dprintf("- found time: %li\n",gdp->xrule);
+	sscanf(tmpstr,"%li%n",&gdp->xrule,&k);
+	if (k) dprintf("- found time: %li\n",gdp->xrule);
     } else {
-	sscanf(tmpstr,"%lf%n",&gdp->yrule,&j);
-	if (j) dprintf("- found number: %f\n",gdp->yrule);
+	sscanf(tmpstr,"%lf%n",&gdp->yrule,&k);
+	if (k) dprintf("- found number: %f\n",gdp->yrule);
     }
-    if (!j) {
+    if (!k) {
 	if ((gdp->vidx=find_var(im,tmpstr))<0) {
 	    rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
 	    return 1;
 	}
 	dprintf("- found vname: '%s' vidx %li\n",tmpstr,gdp->vidx);
     }
-    /* "*eaten" is still pointing to the original location,
-    ** "*eaten +i" is pointing to the character after the color
-    ** or to the terminating '\0' in which case we're finished.
-    */
-    if (line[*eaten+i]=='\0') {
-	*eaten+=i;
-	return 0;
+
+    if (j) {
+	j++;
+	dprintf("- examining color '%s'\n",&tmpstr[j]);
+	if (rrd_parse_color(&tmpstr[j],gdp)) {
+	    rrd_set_error("Could not parse color in '%s'",&tmpstr[j]);
+	    return 1;
+	}
+	dprintf("- parsed color 0x%08x\n",(unsigned int)gdp->col);
+	colorfound=1;
+    } else {
+	dprintf("- no color present in '%s'\n",tmpstr);
     }
-    *eaten+=++i;
 
-    /* If a color is specified and the only remaining part is
-    ** ":STACK" then it is assumed to be the legend.  An empty
-    ** legend can be specified as expected.  This means the
-    ** following can be done:  LINE1:x#FF0000FF::STACK
-    */
-    if (colorfound) { /* no legend if no color */
-	if (gdp->gf == GF_TICK) {
-	    dprintf("- looking for optional number\n");
-	    sscanf(&line[*eaten],"%lf:%n",&gdp->yrule,&j);
-	    if (j) {
-		dprintf("- found number %f\n",gdp->yrule);
-		(*eaten)+=j;
-		if (gdp->yrule > 1.0 || gdp->yrule < -1.0) {
-		    rrd_set_error("Tick factor should be <= 1.0");
-		    return 1;
-		}
-	    } else {
-		dprintf("- not found, defaulting to 0.1\n");
-		gdp->yrule=0.1;
-		return 0;
+    (*eaten) += i; /* after vname#color */
+    if (line[*eaten]!='\0') {
+	(*eaten)++;	/* after colon */
+    }
+
+    if (gdp->gf == GF_TICK) {
+	dprintf("- parsing '%s'\n",&line[*eaten]);
+	dprintf("- looking for optional TICK number\n");
+	j=0;
+	sscanf(&line[*eaten],"%lf%n",&gdp->yrule,&j);
+	if (j) {
+	    if (line[*eaten+j]!='\0' && line[*eaten+j]!=':') {
+		rrd_set_error("Cannot parse TICK fraction '%s'",line);
+		return 1;
 	    }
+	    dprintf("- found number %f\n",gdp->yrule);
+	    if (gdp->yrule > 1.0 || gdp->yrule < -1.0) {
+		rrd_set_error("Tick factor should be <= 1.0");
+		return 1;
+	    }
+	    (*eaten)+=j;
+	} else {
+            dprintf("- not found, defaulting to 0.1\n");
+            gdp->yrule=0.1;
 	}
+	if (line[*eaten] == '\0') {
+	    dprintf("- done parsing line\n");
+	    return 0;
+	} else { if (line[*eaten] == ':') {
+	   	    (*eaten)++;	   
+	         } else {
+   	             rrd_set_error("Can't make sense of that TICK line");
+	           return 1;
+                 }
+        }
+    }
+
+    dprintf("- parsing '%s'\n",&line[*eaten]);
+
+    /* Legend is next.  A legend without a color is an error.
+    ** Stacking an item without having a legend is OK however
+    ** then an empty legend should be specified.
+    **   LINE:val#color:STACK	means legend is string "STACK"
+    **   LINE:val#color::STACK	means no legend, and do STACK
+    **   LINE:val:STACK		is an error (legend but no color)
+    **   LINE:val::STACK	means no legend, and do STACK
+    */
+    if (colorfound) {
+	int err=0;
+        char *linecp = strdup(line);
 	dprintf("- looking for optional legend\n");
-	dprintf("- in '%s'\n",&line[*eaten]);
-	if (rrd_parse_legend(line, eaten, gdp)) return 1;
+	
+	dprintf("- examining '%s'\n",&line[*eaten]);
+	if (linecp[*eaten] != '\0' && linecp[*eaten] != ':') {
+	    int spi;		
+	    /* If the legend is not empty, it has to be prefixed with spacecnt ' ' characters. This then gets
+	     * replaced by the color box later on. */
+	    for (spi=0;spi<spacecnt && (*eaten) > 1;spi++){
+   	       linecp[--(*eaten)]=' ';
+	    }
+	}
+
+	if (rrd_parse_legend(linecp, eaten, gdp)) err=1;
+	free(linecp);
+	if (err) return 1;
+
+	dprintf("- found legend '%s'\n", &gdp->legend[2]);
+    } else {
+	dprintf("- skipping empty legend\n");
+	if (line[*eaten] != '\0' && line[*eaten] != ':') {
+	    rrd_set_error("Legend set but no color: %s",&line[*eaten]);
+	    return 1;
+	}
     }
+    if (line[*eaten]=='\0') {
+	dprintf("- done parsing line\n");
+	return 0;
+    }
+    (*eaten)++;	/* after colon */
 
-    /* PART, HRULE, VRULE and TICK cannot be stacked.  We're finished */
+    /* PART, HRULE, VRULE and TICK cannot be stacked. */
     if (   (gdp->gf == GF_HRULE)
 	|| (gdp->gf == GF_VRULE)
+#ifdef WITH_PIECHART
 	|| (gdp->gf == GF_PART)
+#endif
 	|| (gdp->gf == GF_TICK)
 	) return 0;
 
+    dprintf("- parsing '%s'\n",&line[*eaten]);
     if (line[*eaten]!='\0') {
 	dprintf("- still more, should be STACK\n");
-	(*eaten)++;
 	j=scan_for_col(&line[*eaten],5,tmpstr);
-	if (line[*eaten+j]!='\0') {
+	if (line[*eaten+j]!='\0' && line[*eaten+j]!=':') {
+	    /* not 5 chars */
 	    rrd_set_error("Garbage found where STACK expected");
 	    return 1;
 	}
 	if (!strcmp("STACK",tmpstr)) {
 	    dprintf("- found STACK\n");
 	    gdp->stack=1;
-	    (*eaten)+=5;
+	    (*eaten)+=j;
 	} else {
 	    rrd_set_error("Garbage found where STACK expected");
 	    return 1;
 	}
     }
+    if (line[*eaten]=='\0') {
+	dprintf("- done parsing line\n");
+	return 0;
+    }
+    (*eaten)++;
+    dprintf("- parsing '%s'\n",&line[*eaten]);
 
     return 0;
 }
@@ -285,7 +502,7 @@ rrd_parse_vname(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 int
 rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
     int			i=0;
-    char 		command[6]; /* step, start, end */
+    char 		command[7]; /* step, start, end, reduce */
     char		tmpstr[256];
     struct rrd_time_value	start_tv,end_tv;
     time_t		start_tmp=0,end_tmp=0;
@@ -317,21 +534,26 @@ rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *
     (*eaten)+=i;
     dprintf("- using DS '%s'\n",gdp->ds_nam);
 
-    if (rrd_parse_CF(line,eaten,gdp)) return 1;
-
+    if (rrd_parse_CF(line,eaten,gdp,&gdp->cf)) return 1;
+    gdp->cf_reduce = gdp->cf;
+    
     if (line[*eaten]=='\0') return 0;
 
     while (1) {
 	dprintf("- optional parameter follows: %s\n", &line[*eaten]);
 	i=0;
-	sscanf(&line[*eaten], "%5[a-z]=%n", command, &i);
+	sscanf(&line[*eaten], "%6[a-z]=%n", command, &i);
 	if (!i) {
 	    rrd_set_error("Parse error in '%s'",line);
 	    return 1;
 	}
 	(*eaten)+=i;
 	dprintf("- processing '%s'\n",command);
-	if (!strcmp("step",command)) {
+	if (!strcmp("reduce",command)) {
+	  if (rrd_parse_CF(line,eaten,gdp,&gdp->cf_reduce)) return 1;
+	  if (line[*eaten] != '\0')
+	      (*eaten)--;
+	} else if (!strcmp("step",command)) {
 	    i=0;
 	    sscanf(&line[*eaten],"%lu%n",&gdp->step,&i);
 	    (*eaten)+=i;
@@ -442,10 +664,10 @@ rrd_parse_cdef(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 }
 
 void
-rrd_graph_script(int argc, char *argv[], image_desc_t *im) {
+rrd_graph_script(int argc, char *argv[], image_desc_t *im, int optno) {
     int i;
 
-    for (i=optind+1;i<argc;i++) {
+    for (i=optind+optno;i<argc;i++) {
 	graph_desc_t *gdp;
 	unsigned int eaten=0;
 
@@ -458,11 +680,11 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im) {
 	if (rrd_parse_find_gf(argv[i],&eaten,gdp)) return;
 
 	switch (gdp->gf) {
-#if 0
-	/* future command */
-	    case GF_SHIFT:	vname:value
-#endif
+	    case GF_SHIFT:	/* vname:value */
+		if (rrd_parse_shift(argv[i],&eaten,gdp,im)) return;
+		break;
 	    case GF_XPORT:
+		if (rrd_parse_xport(argv[i],&eaten,gdp,im)) return;
 		break;
 	    case GF_PRINT:	/* vname:CF:format -or- vname:format */
 	    case GF_GPRINT:	/* vname:CF:format -or- vname:format */
@@ -471,12 +693,14 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im) {
             case GF_COMMENT:	/* text */
 		if (rrd_parse_legend(argv[i],&eaten,gdp)) return;
 		break;
+	    case GF_STACK:	/* vname-or-value[#color[:legend]] */		
+#ifdef WITH_PIECHART
 	    case GF_PART:	/* value[#color[:legend]] */
+#endif
 	    case GF_VRULE:	/* value#color[:legend] */
 	    case GF_HRULE:	/* value#color[:legend] */
 	    case GF_LINE:	/* vname-or-value[#color[:legend]][:STACK] */
 	    case GF_AREA:	/* vname-or-value[#color[:legend]][:STACK] */
-	    case GF_STACK:	/* vname-or-value[#color[:legend]] */
 	    case GF_TICK:	/* vname#color[:num[:legend]] */
 		if (rrd_parse_PVHLAST(argv[i],&eaten,gdp,im)) return;
 		break;