Changeset 39f84ce4 in mainline for uspace/lib/c/generic/stdio/scanf.c

Timestamp:

2018-06-13T17:11:44Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f4aa1c8

Parents:

5a6c28d1

git-author:

Jiri Svoboda <jiri@…> (2018-06-12 18:11:08)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-13 17:11:44)

Message:

Add range support to scanf's set conversion.

File:

• uspace/lib/c/generic/stdio/scanf.c (modified) (3 diffs)

uspace/lib/c/generic/stdio/scanf.c

@@ -886 +886 @@
 /** Determine if character is in scanset.
  *
+ * Note that we support ranges, although that is a GNU extension.
+ *
  * @param c Character
  * @param scanset Pointer to scanset
@@ -894 +896 @@
         const char *p = scanset;
         bool inverted = false;
+        char startc;
+        char endc;
 
         /* Inverted scanset */
@@ -901 +905 @@
         }
 
-        /* ']' character in scanset */
+        /*
+         * Either ']' or '-' at beginning or after '^' loses special meaning.
+         * However, '-' after ']' (or vice versa) does not.
+         */
         if (*p == ']') {
+                /* ']' character in scanset */
                 if (c == ']')
                         return !inverted;
                 ++p;
+        } else if (*p == '-') {
+                /* '-' character in scanset */
+                if (c == '-')
+                        return !inverted;
+                ++p;
         }
 
         /* Remaining characters */
         while (*p != '\0' && *p != ']') {
+                /* '-' is a range unless it's the last character in scanset */
+                if (*p == '-' && p[1] != ']' && p[1] != '\0') {
+                        startc = p[-1];
+                        endc = p[1];
+
+                        if (c >= startc && c <= endc)
+                                return !inverted;
+
+                        p += 2;
+                        continue;
+                }
+
                 if (*p == c)
                         return !inverted;