X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph_helper.c;h=916af5b4b93eefac0dc2e664234cb0435f1be33c;hb=3882bb0c2d15f97298aaa7602d6353a1888f5547;hp=b464007d8a09f9ef5104f4248391fd21fa4ae26f;hpb=31f6e9071af7d014dac71d42d61594016832868c;p=rrdtool.git

diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index b464007..916af5b 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.2  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.16  Copyright by Tobi Oetiker, 1997-2006
  ****************************************************************************
  * rrd_graph_helper.c  commandline parser functions 
  *                     this code initially written by Alex van den Bogaerdt
@@ -9,31 +9,63 @@
 
 #define dprintf if (gdp->debug) printf
 
+/* NOTE ON PARSING:
+ *
+ * we use the following:
+ * 
+ * i=0;  sscanf(&line[*eaten], "what to find%n", variables, &i)
+ *
+ * Usually you want to find a separator as well.  Example:
+ * i=0; sscanf(&line[*eaten], "%li:%n", &someint, &i)
+ *
+ * When the separator is not found, i is not set and thus remains zero.
+ * Another way would be to compare strlen() to i
+ *
+ * Why is this important?  Because 12345abc should not be matched as
+ * integer 12345 ...
+ */
+
+/* NOTE ON VNAMES:
+ *
+ * "if ((gdp->vidx=find_var(im, l))!=-1)" is not good enough, at least
+ * not by itself.
+ *
+ * A vname as a result of a VDEF is quite different from a vname
+ * resulting of a DEF or CDEF.
+ */
+
+/* NOTE ON VNAMES:
+ *
+ * A vname called "123" is not to be parsed as the number 123
+ */
+
+
 /* 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
+   const char *const line    - a fixed pointer to a fixed string
+   unsigned int *const eaten - a fixed pointer to a changing index in that line
+   graph_desc_t *const gdp   - a fixed pointer to a changing graph description
+   image_desc_t *const im    - a fixed pointer to a changing 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 (const char * const, unsigned int *const, graph_desc_t *const);
+int rrd_parse_legend  (const char * const, unsigned int *const, graph_desc_t *const);
+int rrd_parse_color   (const char * const, graph_desc_t *const);
+int rrd_parse_CF      (const char * const, unsigned int *const, graph_desc_t *const, enum cf_en *const);
+int rrd_parse_print   (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_shift   (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_xport   (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_PVHLAST (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_make_vname   (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_find_vname   (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_def     (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_vdef    (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
+int rrd_parse_cdef    (const char * const, unsigned int *const, graph_desc_t *const, image_desc_t *const);
 
 
 
 int
-rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) {
+rrd_parse_find_gf(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp) {
     char funcname[11],c1=0;
     int i=0;
 
@@ -45,11 +77,13 @@ rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) {
 	i=0;
 	dprintf("Scanning line '%s'\n",&line[*eaten]);
     }
+    i=0;c1='\0';
     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;
     }
+    (*eaten)+=i;
     if ((int)(gdp->gf=gf_conv(funcname)) == -1) {
 	rrd_set_error("'%s' is not a valid function name", funcname);
 	return 1;
@@ -57,37 +91,57 @@ rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) {
 	dprintf("- found function name '%s'\n",funcname);
     }
 
-    if (gdp->gf == GF_LINE) {
-	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);
+    if (c1 == '\0') {
+	rrd_set_error("Function %s needs parameters.  Line: %s\n",funcname,line);
+	return 1;
+    }
+    if (c1 == ':') (*eaten)++;
+
+    /* Some commands have a parameter before the colon
+     * (currently only LINE)
+     */
+    switch (gdp->gf) {
+	case GF_LINE:
+	    if (c1 == ':') {
+		gdp->linewidth=1;
+		dprintf("- - using default width of 1\n");
+	    } else {
+		i=0;sscanf(&line[*eaten],"%lf:%n",&gdp->linewidth,&i);
+		if (!i) {
+		    rrd_set_error("Cannot parse line width '%s' in line '%s'\n",&line[*eaten],line);
 		    return 1;
+		} else {
+		    dprintf("- - scanned width %f\n",gdp->linewidth);
+		    if (isnan(gdp->linewidth)) {
+			rrd_set_error("LINE width '%s' is not a number in line '%s'\n",&line[*eaten],line);
+			return 1;
+		    }
+		    if (isinf(gdp->linewidth)) {
+			rrd_set_error("LINE width '%s' is out of range in line '%s'\n",&line[*eaten],line);
+			return 1;
+		    }
+		    if (gdp->linewidth<0) {
+			rrd_set_error("LINE width '%s' is less than 0 in line '%s'\n",&line[*eaten],line);
+			return 1;
+		    }
 		}
-		gdp->linewidth=width;
-		dprintf("- - using width %f\n",width);
-	    } else {
-		rrd_set_error("LINE width: %s",line);
-		return 1;
+		(*eaten)+=i;
 	    }
-	}
-    } else {
-	if (c1 != ':') {
-	    rrd_set_error("Malformed %s command: %s",funcname,line);
+	    break;
+	default:
+	    if (c1 == ':') break;
+	    rrd_set_error("Malformed '%s' command in line '%s'\n",&line[*eaten],line);
 	    return 1;
-	}
     }
-    (*eaten)+=++i;
+    if (line[*eaten] == '\0') {
+       rrd_set_error("Expected some arguments after '%s'\n",line);
+       return 1;
+    }
     return 0;
 }
 
 int
-rrd_parse_legend(char *line, unsigned int *eaten, graph_desc_t *gdp) {
+rrd_parse_legend(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp) {
     int i;
 
     if (line[*eaten]=='\0' || line[*eaten]==':') {
@@ -108,7 +162,7 @@ rrd_parse_legend(char *line, unsigned int *eaten, graph_desc_t *gdp) {
 }
 
 int
-rrd_parse_color(char *string, graph_desc_t *gdp) {
+rrd_parse_color(const char *const string, graph_desc_t *const gdp) {
     unsigned int r=0,g=0,b=0,a=0,i;
 
     /* matches the following formats:
@@ -119,7 +173,7 @@ rrd_parse_color(char *string, graph_desc_t *gdp) {
     */
 
     i=0;
-    while (string[i] && isxdigit(string[i])) i++;
+    while (string[i] && isxdigit((unsigned int)string[i])) i++;
     if (string[i] != '\0') return 1; /* garbage follows hexdigits */
     switch (i) {
 	case 3:
@@ -144,7 +198,7 @@ rrd_parse_color(char *string, graph_desc_t *gdp) {
 }
 
 int
-rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp, enum cf_en *cf) {
+rrd_parse_CF(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, enum cf_en *cf) {
     char 		symname[CF_NAM_SIZE];
     int			i=0;
 
@@ -165,28 +219,51 @@ rrd_parse_CF(char *line, unsigned int *eaten, graph_desc_t *gdp, enum cf_en *cf)
     return 0;
 }
 
-/* Parsing old-style xPRINT and new-style xPRINT */
+/* Try to match next token as a vname.
+ *
+ * Returns:
+ * -1     an error occured and the error string is set
+ * other  the vname index number
+ *
+ * *eaten is incremented only when a vname is found.
+ */
 int
-rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
-    /* vname:CF:format in case of DEF-based vname
-    ** vname:CF:format in case of CDEF-based vname
-    ** vname:format in case of VDEF-based vname
-    */
+rrd_parse_find_vname(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
     char tmpstr[MAX_VNAME_LEN+1];
-    int i=0;
+    int i;
+    long vidx;
 
-    sscanf(&line[*eaten], DEF_NAM_FMT ":%n", tmpstr,&i);
+    i=0;sscanf(&line[*eaten], DEF_NAM_FMT "%n", tmpstr,&i);
     if (!i) {
 	rrd_set_error("Could not parse line '%s'",line);
-	return 1;
+	return -1;
     }
-    (*eaten)+=i;
-    dprintf("- Found candidate vname '%s'\n",tmpstr);
+    if (line[*eaten+i]!=':' && line[*eaten+i]!='\0') {
+	rrd_set_error("Could not parse line '%s'",line);
+	return -1;
+    }
+    dprintf("- Considering '%s'\n",tmpstr);
 
-    if ((gdp->vidx=find_var(im,tmpstr))<0) {
+    if ((vidx=find_var(im,tmpstr))<0) {
+	dprintf("- Not a vname\n");
 	rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
-	return 1;
+	return -1;
     }
+    dprintf("- Found vname '%s' vidx '%li'\n",tmpstr,gdp->vidx);
+    if (line[*eaten+i]==':') i++;
+    (*eaten)+=i;
+    return vidx;
+}
+
+/* Parsing old-style xPRINT and new-style xPRINT */
+int
+rrd_parse_print(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
+    /* vname:CF:format in case of DEF-based vname
+    ** vname:CF:format in case of CDEF-based vname
+    ** vname:format[:strftime] in case of VDEF-based vname
+    */
+    if ((gdp->vidx=rrd_parse_find_vname(line,eaten,gdp,im))<0) return 1;
+ 
     switch (im->gdes[gdp->vidx].gf) {
 	case GF_DEF:
 	case GF_CDEF:
@@ -197,7 +274,7 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 	    dprintf("- vname is of type VDEF\n");
 	    break;
 	default:
-	    rrd_set_error("Encountered unknown type variable '%s'",tmpstr);
+	    rrd_set_error("Encountered unknown type variable '%s'",im->gdes[gdp->vidx].vname);
 	    return 1;
     }
 
@@ -206,78 +283,83 @@ rrd_parse_print(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
        get the format at this juncture */
     strcpy(gdp->format,gdp->legend);
     gdp->legend[0]='\0';	
+    /* this is a very crud test, parsing :style flags should be in a function */
+    if (im->gdes[gdp->vidx].gf == GF_VDEF && strcmp(line+(*eaten),":strftime")==0){
+	gdp->strftm = 1;
+        (*eaten)+=strlen(":strftime");
+    }
     return 0;
 }
 
+/* SHIFT:_def_or_cdef:_vdef_or_number_
+ */
 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;
+rrd_parse_shift(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
+    int i;
+
+    if ((gdp->vidx=rrd_parse_find_vname(line,eaten,gdp,im))<0) return 1;
+
+    switch (im->gdes[gdp->vidx].gf) {
+	case GF_DEF:
+	case GF_CDEF:
+	    dprintf("- vname is of type DEF or CDEF, OK\n");
+	    break;
+	case GF_VDEF:
+	    rrd_set_error("Cannot shift a VDEF: '%s' in line '%s'\n",im->gdes[gdp->vidx].vname,line);
+	    return 1;
+	default:
+	    rrd_set_error("Encountered unknown type variable '%s' in line '%s'",im->gdes[gdp->vidx].vname,line);
+	    return 1;
+    }
+
+    if ((gdp->shidx=rrd_parse_find_vname(line,eaten,gdp,im))>=0) {
+	switch (im->gdes[gdp->shidx].gf) {
+	    case GF_DEF:
+	    case GF_CDEF:
+		rrd_set_error("Offset cannot be a (C)DEF: '%s' in line '%s'\n",im->gdes[gdp->shidx].vname,line);
+		return 1;
+	    case GF_VDEF:
+		dprintf("- vname is of type VDEF, OK\n");
+		break;
+	    default:
+		rrd_set_error("Encountered unknown type variable '%s' in line '%s'",im->gdes[gdp->vidx].vname,line);
+		return 1;
 	}
-	
-        /* 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;
+    } else {
+	rrd_clear_error();
+	i=0; sscanf(&line[*eaten],"%li%n",&gdp->shval,&i);
+	if (i!=(int)strlen(&line[*eaten])) {
+	    rrd_set_error("Not a valid offset: %s in line %s",&line[*eaten],line);
+	    return 1;
 	}
-	
-	*eaten = strlen(line);
-	rc = 0;
-
- out:
-	free(l);
-	return rc;
+	(*eaten)+=i;
+	dprintf("- offset is number %li\n",gdp->shval);
+	gdp->shidx = -1;
+    }
+    return 0;
 }
 
+/* XPORT:_def_or_cdef[:legend]
+ */
 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;
+rrd_parse_xport(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
+    if ((gdp->vidx=rrd_parse_find_vname(line,eaten,gdp,im))<0) return 1;
+
+    switch (im->gdes[gdp->vidx].gf) {
+	case GF_DEF:
+	case GF_CDEF:
+	    dprintf("- vname is of type DEF or CDEF, OK\n");
+	    break;
+	case GF_VDEF:
+	    rrd_set_error("Cannot xport a VDEF: '%s' in line '%s'\n",im->gdes[gdp->vidx].vname,line);
+	    return 1;
+	default:
+	    rrd_set_error("Encountered unknown type variable '%s' in line '%s'",im->gdes[gdp->vidx].vname,line);
+	    return 1;
+    }
+    dprintf("- looking for legend in '%s'\n",&line[*eaten]);
+    if (rrd_parse_legend(line,eaten,gdp)) return 1;
+    return 0;
 }
 
 /* Parsing of PART, VRULE, HRULE, LINE, AREA, STACK and TICK
@@ -291,13 +373,33 @@ rrd_parse_xport(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 ** with more than MAX_VNAME_LEN significant digits.
 */
 int
-rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+rrd_parse_PVHLAST(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
     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]);
 
+    /* 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]!=':') {
 	rrd_set_error("Cannot parse line '%s'",line);
@@ -309,22 +411,56 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
     if (j) {
 	tmpstr[j]='\0';
     }
-
-    dprintf("- examining value '%s'\n",tmpstr);
-    k=0;
-    if (gdp->gf == GF_VRULE) {
-	sscanf(tmpstr,"%li%n",&gdp->xrule,&k);
-	if (k) dprintf("- found time: %li\n",gdp->xrule);
+    /* We now have:
+     * tmpstr[0]    containing vname
+     * tmpstr[j]    if j!=0 then containing color
+     * i            size of vname + color
+     * j            if j!=0 then size of vname
+     */
+
+    /* Number or vname ?
+     * If it is an existing vname, that's OK, provided that it is a
+     * valid type (need time for VRULE, not a float)
+     * Else see if it parses as a number.
+     */
+    dprintf("- examining string '%s'\n",tmpstr);
+    if ((gdp->vidx=find_var(im,tmpstr))>=0) {
+	dprintf("- found vname: '%s' vidx %li\n",tmpstr,gdp->vidx);
+	switch (gdp->gf) {
+#ifdef WITH_PIECHART
+	    case GF_PART:
+#endif
+	    case GF_VRULE:
+	    case GF_HRULE:
+		if (im->gdes[gdp->vidx].gf != GF_VDEF) {
+		    rrd_set_error("Using vname %s of wrong type in line %s\n",im->gdes[gdp->gf].vname,line);
+		    return 1;
+		}
+		break;
+	    default:;
+	}
     } else {
-	sscanf(tmpstr,"%lf%n",&gdp->yrule,&k);
-	if (k) dprintf("- found number: %f\n",gdp->yrule);
-    }
-    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("- it is not an existing vname\n");
+	switch (gdp->gf) {
+	    case GF_VRULE:
+		k=0;sscanf(tmpstr,"%li%n",&gdp->xrule,&k);
+		if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
+		    dprintf("- found time: %li\n",gdp->xrule);
+		} else {
+		    dprintf("- is is not a valid number: %li\n",gdp->xrule);
+		    rrd_set_error("parameter '%s' does not represent time in line %s\n",tmpstr,line);
+		    return 1;
+		}
+	    default:
+		k=0;sscanf(tmpstr,"%lf%n",&gdp->yrule,&k);
+		if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
+		    dprintf("- found number: %f\n",gdp->yrule);
+		} else {
+		    dprintf("- is is not a valid number: %li\n",gdp->xrule);
+		    rrd_set_error("parameter '%s' does not represent a number in line %s\n",tmpstr,line);
+		    return 1;
+		}
 	}
-	dprintf("- found vname: '%s' vidx %li\n",tmpstr,gdp->vidx);
     }
 
     if (j) {
@@ -388,23 +524,21 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
     **   LINE:val::STACK	means no legend, and do STACK
     */
     if (colorfound) {
-	char c1,c2;
 	int err=0;
         char *linecp = strdup(line);
 	dprintf("- looking for optional legend\n");
-
-	/* The legend needs to be prefixed with "m ". This then gets
-	** replaced by the color box. */
-
+	
 	dprintf("- examining '%s'\n",&line[*eaten]);
-
-	(*eaten)--;
-	linecp[*eaten]=' ';
-	(*eaten)--;
-	linecp[*eaten]='m';
+	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;
 
@@ -456,15 +590,11 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
     (*eaten)++;
     dprintf("- parsing '%s'\n",&line[*eaten]);
 
-    /* have simpler code in the drawing section */
-    if ( gdp->gf == GF_STACK ){
-	    gdp->stack=1;
-    }
     return 0;
 }
 
 int
-rrd_parse_vname(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+rrd_parse_make_vname(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
     char tmpstr[MAX_VNAME_LEN + 10];
     int i=0;
 
@@ -486,7 +616,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) {
+rrd_parse_def(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
     int			i=0;
     char 		command[7]; /* step, start, end, reduce */
     char		tmpstr[256];
@@ -502,7 +632,7 @@ rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *
     dprintf("- parsing '%s'\n",&line[*eaten]);
     dprintf("- from line '%s'\n",line);
 
-    if (rrd_parse_vname(line,eaten,gdp,im)) return 1;
+    if (rrd_parse_make_vname(line,eaten,gdp,im)) return 1;
     i=scan_for_col(&line[*eaten],254,gdp->rrd);
     if (line[*eaten+i]!=':') {
 	rrd_set_error("Problems reading database name");
@@ -542,6 +672,7 @@ rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *
 	} else if (!strcmp("step",command)) {
 	    i=0;
 	    sscanf(&line[*eaten],"%lu%n",&gdp->step,&i);
+	    gdp->step_orig = gdp->step;
 	    (*eaten)+=i;
 	    dprintf("- using step %lu\n",gdp->step);
 	} else if (!strcmp("start",command)) {
@@ -591,6 +722,8 @@ rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *
 
     gdp->start = start_tmp;
     gdp->end = end_tmp;
+    gdp->start_orig = start_tmp;
+    gdp->end_orig = end_tmp;
 
     dprintf("- start time %lu\n",gdp->start);
     dprintf("- end   time %lu\n",gdp->end);
@@ -599,12 +732,12 @@ rrd_parse_def(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *
 }
 
 int
-rrd_parse_vdef(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+rrd_parse_vdef(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
     char tmpstr[MAX_VNAME_LEN+1];	/* vname\0 */
     int i=0;
 
     dprintf("- parsing '%s'\n",&line[*eaten]);
-    if (rrd_parse_vname(line,eaten,gdp,im)) return 1;
+    if (rrd_parse_make_vname(line,eaten,gdp,im)) return 1;
 
     sscanf(&line[*eaten], DEF_NAM_FMT ",%n", tmpstr,&i);
     if (!i) {
@@ -633,9 +766,9 @@ rrd_parse_vdef(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t
 }
 
 int
-rrd_parse_cdef(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc_t *im) {
+rrd_parse_cdef(const char *const line, unsigned int *const eaten, graph_desc_t *const gdp, image_desc_t *const im) {
     dprintf("- parsing '%s'\n",&line[*eaten]);
-    if (rrd_parse_vname(line,eaten,gdp,im)) return 1;
+    if (rrd_parse_make_vname(line,eaten,gdp,im)) return 1;
     if ((gdp->rpnp = rpn_parse(
 	(void *)im,
 	&line[*eaten],
@@ -650,8 +783,11 @@ 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, int optno) {
+rrd_graph_script(int argc, char *argv[], image_desc_t *const im, int optno) {
     int i;
+    /* save state for STACK backward compat function */
+    enum gf_en     last_gf=GF_PRINT;
+    float          last_linewidth=0.0;
 
     for (i=optind+optno;i<argc;i++) {
 	graph_desc_t *gdp;
@@ -664,7 +800,7 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im, int optno) {
 #endif
 
 	if (rrd_parse_find_gf(argv[i],&eaten,gdp)) return;
-
+        
 	switch (gdp->gf) {
 	    case GF_SHIFT:	/* vname:value */
 		if (rrd_parse_shift(argv[i],&eaten,gdp,im)) return;
@@ -673,13 +809,13 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im, int optno) {
 		if (rrd_parse_xport(argv[i],&eaten,gdp,im)) return;
 		break;
 	    case GF_PRINT:	/* vname:CF:format -or- vname:format */
+		im->prt_c++;		
 	    case GF_GPRINT:	/* vname:CF:format -or- vname:format */
 		if (rrd_parse_print(argv[i],&eaten,gdp,im)) return;
 		break;
             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
@@ -688,7 +824,20 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im, int optno) {
 	    case GF_LINE:	/* vname-or-value[#color[:legend]][:STACK] */
 	    case GF_AREA:	/* vname-or-value[#color[:legend]][:STACK] */
 	    case GF_TICK:	/* vname#color[:num[:legend]] */
-		if (rrd_parse_PVHLAST(argv[i],&eaten,gdp,im)) return;
+		if (rrd_parse_PVHLAST(argv[i],&eaten,gdp,im))return;
+                last_gf = gdp->gf;
+                last_linewidth = gdp->linewidth;
+		break;
+	    case GF_STACK:	/* vname-or-value[#color[:legend]] */		
+		if (rrd_parse_PVHLAST(argv[i],&eaten,gdp,im))return;
+                if (last_gf == GF_LINE || last_gf == GF_AREA){
+                   gdp->gf = last_gf;
+                   gdp->linewidth = last_linewidth;
+                } else {
+                   rrd_set_error("STACK must follow LINE or AREA! command:\n%s",
+                        &argv[i][eaten],argv[i]);
+                   return;
+                }
 		break;
 	/* data acquisition */
 	    case GF_DEF:	/* vname=x:DS:CF:[:step=#][:start=#][:end=#] */