index 6028b01b6f4bbe6c6443891aa874f39090384e9c..6babc574c60521930c44e307d1a0a6a68620846f 100644 (file)
/****************************************************************************
- * RRDtool 1.2.8 Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.9 Copyright by Tobi Oetiker, 1997-2005
****************************************************************************
* rrd_graph_helper.c commandline parser functions
* this code initially written by Alex van den Bogaerdt
*/
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:
@@ -330,16 +330,28 @@ rrd_parse_PVHLAST(char *line, unsigned int *eaten, graph_desc_t *gdp, image_desc
tmpstr[j]='\0';
}
+ /* Number or vname ?
+ * It is a number only if "k" equals either "j" or "i",
+ * depending on which is appropriate
+ */
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);
+ if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
+ dprintf("- found time: %li\n",gdp->xrule);
+ } else {
+ gdp->xrule=0; /* reset the value to "none" */
+ }
} else {
sscanf(tmpstr,"%lf%n",&gdp->yrule,&k);
- if (k) dprintf("- found number: %f\n",gdp->yrule);
+ if (((j!=0)&&(k==j))||((j==0)&&(k==i))) {
+ dprintf("- found number: %f\n",gdp->yrule);
+ } else {
+ gdp->yrule=DNAN; /* reset the value to "none" */
+ }
}
- if (!k) {
+ if (((j!=0)&&(k!=j))||((j==0)&&(k!=i))) {
if ((gdp->vidx=find_var(im,tmpstr))<0) {
rrd_set_error("Not a valid vname: %s in line %s",tmpstr,line);
return 1;