X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Frrd_graph_helper.c;h=8855dcd1a5069de18f1c6dc7156699cd10ee0ca6;hb=ac2cd917b8b2c9a76824285c3d01050665d6b5c7;hp=bca17d0526766459fdf70c9fa11df4f79cc99ff6;hpb=d65a52e9ba9c5cb9342b6266703f7dae53ddacad;p=rrdtool.git

diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c
index bca17d0..8855dcd 100644
--- a/src/rrd_graph_helper.c
+++ b/src/rrd_graph_helper.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_graph_helper.c  commandline parser functions 
  *                     this code initially written by Alex van den Bogaerdt
@@ -776,6 +776,9 @@ rrd_parse_cdef(const char *const line, unsigned int *const eaten, graph_desc_t *
 void
 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;
@@ -788,7 +791,7 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *const 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;
@@ -797,13 +800,13 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *const 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
@@ -812,7 +815,20 @@ rrd_graph_script(int argc, char *argv[], image_desc_t *const 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=#] */