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

diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index bb6415d..916af5b 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.c
@@ -1,42 +1,75 @@
 /****************************************************************************
- * RRDtool 1.2rc5  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 was probably writtenn by Alex van den Bogaerdt
+ *                     this code initially written by Alex van den Bogaerdt
  ****************************************************************************/
 
 #include "rrd_graph.h"
 
 #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) {
-    char funcname[11],c1=0,c2=0;
+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;
 
+    /* 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;
@@ -44,73 +77,133 @@ 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);
+    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;
-    }
-    if (gdp->gf == GF_LINE) {
-	if (c1 < '1' || c1 > '3' || c2 != ':') {
-	    rrd_set_error("Malformed LINE command: %s",line);
-	    return 1;
-	}
-	gdp->linewidth=c1-'0';
-	i++;
     } else {
-	if (c1 != ':') {
-	    rrd_set_error("Malformed %s command: %s",funcname,line);
+	dprintf("- found function name '%s'\n",funcname);
+    }
+
+    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;
+		    }
+		}
+		(*eaten)+=i;
+	    }
+	    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;
 
-    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;
-
-    if (string[0] != '#') return 1;
-    sscanf(string, "#%02x%02x%02x%n%02x%n%*s%n",
-				&r,&g,&b,&i1,&a,&i2,&i3);
+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:
+    ** 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((unsigned int)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, 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;
 
     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;
     }
@@ -126,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:
@@ -158,95 +274,98 @@ 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;
     }
 
     if (rrd_parse_legend(line,eaten,gdp)) return 1;
-    /* for *PRINT the legend itself gets renderd later. We only
+    /* 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';	
+    /* 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
-** 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.
@@ -254,13 +373,32 @@ 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) {
-    int i,j;
+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]);
-    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]!=':') {
@@ -270,81 +408,155 @@ 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 (j) {
+	tmpstr[j]='\0';
+    }
+    /* 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 {
+	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;
+		}
+	}
+    }
+
+    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]);
+	    rrd_set_error("Could not parse color in '%s'",&tmpstr[j]);
 	    return 1;
 	}
-	tmpstr[j]='\0';
 	dprintf("- parsed color 0x%08x\n",(unsigned int)gdp->col);
 	colorfound=1;
+    } else {
+	dprintf("- no color present in '%s'\n",tmpstr);
     }
 
-    dprintf("- examining '%s'\n",tmpstr);
-    j=0;
-    if (gdp->gf == GF_VRULE) {
-	sscanf(tmpstr,"%li%n",&gdp->xrule,&j);
-	if (j) dprintf("- found time: %li\n",gdp->xrule);
-    } else {
-	sscanf(tmpstr,"%lf%n",&gdp->yrule,&j);
-	if (j) dprintf("- found number: %f\n",gdp->yrule);
+    (*eaten) += i; /* after vname#color */
+    if (line[*eaten]!='\0') {
+	(*eaten)++;	/* after colon */
     }
-    if (!j) {
-	if ((gdp->vidx=find_var(im,tmpstr))<0) {
-	    rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
-	    return 1;
+
+    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;
 	}
-	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 (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;
+                 }
+        }
     }
-    *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
+    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) { /* 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;
-		}
-		if (line[*eaten] == ':')
-		    (*eaten)++;
-	    } else {
-		dprintf("- not found, defaulting to 0.1\n");
-		gdp->yrule=0.1;
-		return 0;
+    if (colorfound) {
+	int err=0;
+        char *linecp = strdup(line);
+	dprintf("- looking for optional legend\n");
+	
+	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)]=' ';
 	    }
 	}
-	dprintf("- looking for optional legend\n");
-	dprintf("- in '%s'\n",&line[*eaten]);
-	/* the legend for a graph item must start with "m " the first
-           m will then be over drawn with a color box. Since there
-           is ample space I overwrite the first few characters of the line
-	   with the material that I want to see in the legend */
-	if (line[*eaten] != '\0' && line[*eaten] != ':'){
-		*eaten = *eaten - 2;
-		line[*eaten] = 'm';
-		line[*eaten+1] = ' ';
-	}	
-	if (rrd_parse_legend(line, eaten, gdp)) return 1;
-    }
-
-    /* PART, HRULE, VRULE and TICK cannot be stacked.  We're finished */
+
+	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. */
     if (   (gdp->gf == GF_HRULE)
 	|| (gdp->gf == GF_VRULE)
 #ifdef WITH_PIECHART
@@ -353,28 +565,36 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
 	|| (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;
 }
 
 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;
 
@@ -396,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];
@@ -412,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");
@@ -452,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)) {
@@ -501,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);
@@ -509,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) {
@@ -543,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],
@@ -560,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;
@@ -574,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;
@@ -583,6 +809,7 @@ 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;
@@ -596,9 +823,21 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *im, int optno) {
 	    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;
+		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=#] */