From fe3473bb06202f594bcd629186ed51eec37a3a34 Mon Sep 17 00:00:00 2001 From: oetiker Date: Sun, 1 May 2005 10:20:55 +0000 Subject: [PATCH] relax parsing of LINE commands LINE: is valid as well as LINE: eg. LINE1.2323: git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@458 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/rrd_graph_helper.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c index 0ab38fe..653586f 100644 --- a/src/rrd_graph_helper.c +++ b/src/rrd_graph_helper.c @@ -34,7 +34,7 @@ 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; sscanf(&line[*eaten], "DEBUG%n", &i); @@ -44,7 +44,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; @@ -54,12 +54,22 @@ rrd_parse_find_gf(char *line, unsigned int *eaten, graph_desc_t *gdp) { return 1; } 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; + } else { + double width; + *eaten+=i; + if (sscanf(&line[*eaten],"%lf%n:",&width,&i)){ + if (width <= 0){ + rrd_set_error("LINE width is %lf. It must be >= 0 though",width); + return 1; + } + gdp->linewidth=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); -- 2.11.0