Changeset 9d8307a in mainline for uspace/lib/c/generic/stdio/scanf.c

Timestamp:

2018-07-19T11:55:19Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0d83cf6f

Parents:

42f5860

git-author:

Jiri Svoboda <jiri@…> (2018-07-18 17:54:45)

git-committer:

Jiri Svoboda <jiri@…> (2018-07-19 11:55:19)

Message:

Reimplement strtold function in libc.

File:

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

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

@@ -46 +46 @@
 #include <stdio.h>
 #include <stdlib.h>
+
+#include "../private/scanf.h"
 
 typedef enum {
@@ -348 +350 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-static int strbuf_init(strbuf_t *strbuf, cvtspec_t *spec, va_encaps_t *va)
+static errno_t strbuf_init(strbuf_t *strbuf, cvtspec_t *spec, va_encaps_t *va)
 {
         if (spec->noassign) {
@@ -393 +395 @@
  * @return EOK on sucess, ENOMEM if out of memory
  */
-static int strbuf_write(strbuf_t *strbuf, size_t idx, char c)
+static errno_t strbuf_write(strbuf_t *strbuf, size_t idx, char c)
 {
         if (strbuf->memalloc && idx >= strbuf->size) {
@@ -449 +451 @@
 
 /* Skip whitespace in input stream */
-static int vfscanf_skip_ws(FILE *f, int *numchar)
+static errno_t vfscanf_skip_ws(FILE *f, int *numchar)
 {
         int c;
@@ -471 +473 @@
 
 /* Match whitespace. */
-static int vfscanf_match_ws(FILE *f, int *numchar, const char **fmt)
-{
-        int rc;
+static errno_t vfscanf_match_ws(FILE *f, int *numchar, const char **fmt)
+{
+        errno_t rc;
 
         rc = vfscanf_skip_ws(f, numchar);
@@ -492 +494 @@
  * @return EOK on success, EIO on I/O error, EINVAL if input is not valid
  */
-static int __fstrtoimax(FILE *f, int *numchar, int base, size_t width,
+static errno_t __fstrtoimax(FILE *f, int *numchar, int base, size_t width,
     intmax_t *dest)
 {
+        errno_t rc;
         int c;
         intmax_t v;
         int digit;
         int sign;
+
+        rc = vfscanf_skip_ws(f, numchar);
+        if (rc == EIO)
+                return EIO;
 
         c = __fgetc(f, numchar);
@@ -579 +586 @@
  * @return EOK on success, EIO on I/O error, EINVAL if input is not valid
  */
-static int __fstrtoumax(FILE *f, int *numchar, int base, size_t width,
+static errno_t __fstrtoumax(FILE *f, int *numchar, int base, size_t width,
     uintmax_t *dest)
 {
+        errno_t rc;
         int c;
         uintmax_t v;
         int digit;
+
+        rc = vfscanf_skip_ws(f, numchar);
+        if (rc == EIO)
+                return EIO;
 
         c = __fgetc(f, numchar);
@@ -653 +665 @@
  * @return EOK on success, EIO on I/O error, EINVAL if input is not valid
  */
-static int __fstrtold(FILE *f, int *numchar, size_t width, long double *dest)
-{
+errno_t __fstrtold(FILE *f, int *numchar, size_t width,
+    long double *dest)
+{
+        errno_t rc;
         int c;
         long double v;
@@ -665 +679 @@
         int exp;
         int expsign;
+
+        rc = vfscanf_skip_ws(f, numchar);
+        if (rc == EIO)
+                return EIO;
 
         c = __fgetc(f, numchar);
@@ -823 +841 @@
 
 /* Read characters from stream */
-static int __fgetchars(FILE *f, int *numchar, size_t width, strbuf_t *strbuf,
-    size_t *nread)
+static errno_t __fgetchars(FILE *f, int *numchar, size_t width,
+    strbuf_t *strbuf, size_t *nread)
 {
         size_t cnt;
         int c;
-        int rc;
-
+        errno_t rc;
+
+        *nread = 0;
         for (cnt = 0; cnt < width; cnt++) {
                 c = __fgetc(f, numchar);
@@ -849 +868 @@
 
 /* Read non-whitespace string from stream */
-static int __fgetstr(FILE *f, int *numchar, size_t width, strbuf_t *strbuf,
+static errno_t __fgetstr(FILE *f, int *numchar, size_t width, strbuf_t *strbuf,
     size_t *nread)
 {
         size_t cnt;
         int c;
-        int rc;
-        int rc2;
+        errno_t rc;
+        errno_t rc2;
+
+        *nread = 0;
+
+        rc = vfscanf_skip_ws(f, numchar);
+        if (rc == EIO)
+                return EIO;
 
         rc = EOK;
@@ -949 +974 @@
 
 /* Read string of characters from scanset from stream */
-static int __fgetscanstr(FILE *f, int *numchar, size_t width,
+static errno_t __fgetscanstr(FILE *f, int *numchar, size_t width,
     const char *scanset, strbuf_t *strbuf, size_t *nread)
 {
         size_t cnt;
         int c;
-        int rc;
-        int rc2;
+        errno_t rc;
+        errno_t rc2;
 
         rc = EOK;
@@ -990 +1015 @@
 
 /** Perform a single conversion. */
-static int vfscanf_cvt(FILE *f, const char **fmt, va_encaps_t *va,
+static errno_t vfscanf_cvt(FILE *f, const char **fmt, va_encaps_t *va,
     int *numchar, unsigned *ncvt)
 {
-        int rc;
+        errno_t rc;
         int c;
         intmax_t ival;
@@ -1027 +1052 @@
         cvtspec_parse(fmt, &cvtspec);
 
-        if (cvtspec.spcr != cs_set && cvtspec.spcr != cs_char &&
-            cvtspec.spcr != cs_numchar) {
-                /* Skip whitespace */
-                rc = vfscanf_skip_ws(f, numchar);
-                if (rc == EIO)
-                        return EIO;
-
-                assert(rc == EOK);
-        }
-
         width = cvtspec.have_width ? cvtspec.width : SIZE_MAX;
 
@@ -1042 +1057 @@
         case cs_percent:
                 /* Match % character */
+                rc = vfscanf_skip_ws(f, numchar);
+                if (rc == EOF)
+                        return EIO;
+
                 c = __fgetc(f, numchar);
                 if (c == EOF)