source: freewrt/package/rrdcollect/patches/rrdcollect-scan.patch@ 428f140

rrdcollect-0.2.3

@@ -74 +74 @@
                                                 } while (isdigit(*fmt));
                                         }
 
+                                        /* skip white spaces like scanf does */
+                                        if (strchr("difuoxX", *fmt))
+                                                while (isspace(*buf))
+                                                        buf++;
+                                        
                                         /* FIXME: we should check afterward:
                                          * if (start == buf || start == '-' && buf-start == 1)
                                          *      die("WTF???  zero-length number???");
@@ -150 +155 @@
                                                                 buf++, length--;
                                                         }
 
-                                                        /* ignore if value not found */
-                                                        if(value == 0)
-                                                                return 0;
-
                                                         if (!ignore)
-                                                                counter[i++]->value = valuedup(value);
+                                                                counter[i++]->value = strndup(start, buf - start);
                                                         break;
                                                         
                                                 case 'c':
+                                                        if (length < 0)
+                                                             length = 1;        // default length is 1
+                                                        
                                                         while (*buf && length > 0) {
                                                                 buf++, length--;
                                                         }
                                                         if (length > 0)
                                                                 return 2;
 
-                                                        /* ignore if value not found */
-                                                        if(value == 0)
-                                                                return 0;
-                                                        
                                                         if (!ignore)
-                                                                counter[i++]->value = valuedup(value);
+                                                                counter[i++]->value = strndup(start, buf - start);
                                                         break;
                                                         
                                                         
@@ -192 +192 @@
                         case '\f':
                         case '\v':
                                 /* don't match if not at least one space */
-                                if(!isspace(*(buf)))
+                                if(!isspace(*buf))
                                         return 0;
                                 else
                                         buf++;
@@ -208 +208 @@
                                         case '\v':
                                                 break;
                                         default:
-                                                while (isspace(*(buf)))
+                                                while (isspace(*buf))
                                                         buf++;
                                 }
                                 fmt++;