Changes in uspace/lib/posix/source/stdio/scanf.c [fbf4dc1:fdf97f6] in mainline

File:

• uspace/lib/posix/source/stdio/scanf.c (modified) (4 diffs)

uspace/lib/posix/source/stdio/scanf.c

@@ -698 +698 @@
                                                         break;
                                                 case LMOD_j: ;
-                                                        uintmax_t *pj = va_arg(arg, uintmax_t *);
-                                                        *pj = (uintmax_t) ures;
+                                                        posix_uintmax_t *pj = va_arg(arg, posix_uintmax_t *);
+                                                        *pj = (posix_uintmax_t) ures;
                                                         break;
                                                 case LMOD_z: ;
@@ -740 +740 @@
                                                         break;
                                                 case LMOD_j: ;
-                                                        intmax_t *pj = va_arg(arg, intmax_t *);
-                                                        *pj = (intmax_t) sres;
+                                                        posix_intmax_t *pj = va_arg(arg, posix_intmax_t *);
+                                                        *pj = (posix_intmax_t) sres;
                                                         break;
                                                 case LMOD_z: ;
@@ -748 +748 @@
                                                         break;
                                                 case LMOD_t: ;
-                                                        ptrdiff_t *pt = va_arg(arg, ptrdiff_t *);
-                                                        *pt = (ptrdiff_t) sres;
+                                                        posix_ptrdiff_t *pt = va_arg(arg, posix_ptrdiff_t *);
+                                                        *pt = (posix_ptrdiff_t) sres;
                                                         break;
                                                 default:
@@ -1220 +1220 @@
 }
 
+// FIXME: put the testcases to the app/tester after scanf is included into libc
+
+#if 0
+
+//#include <stdio.h>
+//#include <malloc.h>
+//#include <string.h>
+
+#define test_val(fmt, exp_val, act_val) \
+        if (exp_val == act_val) { \
+                printf("succ, expected "fmt", actual "fmt"\n", exp_val, act_val); \
+        } else { \
+                printf("fail, expected "fmt", actual "fmt"\n", exp_val, act_val); \
+                ++fail; \
+        }
+
+#define test_str(fmt, exp_str, act_str) \
+        if (posix_strcmp(exp_str, act_str) == 0) { \
+                printf("succ, expected "fmt", actual "fmt"\n", exp_str, act_str); \
+        } else { \
+                printf("fail, expected "fmt", actual "fmt"\n", exp_str, act_str); \
+                ++fail; \
+        }
+
+void __posix_scanf_test(void);
+void __posix_scanf_test(void)
+{
+        int fail = 0;
+
+        int ret;
+
+        unsigned char uhh;
+        signed char shh;
+        unsigned short uh;
+        short sh;
+        unsigned udef;
+        int sdef;
+        unsigned long ul;
+        long sl;
+        unsigned long long ull;
+        long long sll;
+        void *p;
+        
+        float f;
+        double d;
+        long double ld;
+
+        char str[20];
+        char seq[20];
+        char scanset[20];
+
+        char *pstr;
+        char *pseq;
+        char *pscanset;
+        
+        ret = posix_sscanf(
+            "\n j tt % \t -121314 98765 aqw 0765 0x77 0xABCDEF88 -99 884",
+            " j tt %%%3hhd%1hhu%3hd %3hu%u aqw%n %lo%llx %p %li %lld",
+            &shh, &uhh, &sh, &uh, &udef, &sdef, &ul, &ull, &p, &sl, &sll);
+        test_val("%d", -12, shh);
+        test_val("%u", 1, uhh);
+        test_val("%d", 314, sh);
+        test_val("%u", 987, uh);
+        test_val("%u", 65, udef);
+        test_val("%d", 28, sdef);
+        test_val("%lo", (unsigned long) 0765, ul);
+        test_val("%llx", (unsigned long long) 0x77, ull);
+        test_val("%p", (void *) 0xABCDEF88, p);
+        test_val("%ld", (long) -99, sl);
+        test_val("%lld", (long long) 884, sll);
+        test_val("%d", 10, ret);
+
+        ret = posix_sscanf(
+            "\n \t\t1.0 -0x555.AP10 1234.5678e12",
+            "%f %lf %Lf",
+            &f, &d, &ld);
+        test_val("%f", 1.0, f);
+        test_val("%lf", (double) -0x555.AP10, d);
+        test_val("%Lf", (long double) 1234.5678e12, ld);
+        test_val("%d", 3, ret);
+         
+        ret = posix_sscanf(
+            "\n\n\thello world    \n",
+            "%5s %ms",
+            str, &pstr);
+        test_str("%s", "hello", str);
+        test_str("%s", "world", pstr);
+        test_val("%d", 2, ret);
+        free(pstr);
+
+        ret = posix_sscanf(
+            "\n\n\thello world    \n",
+            " %5c %mc",
+            seq, &pseq);
+        seq[5] = '\0';
+        pseq[1] = '\0';
+        test_str("%s", "hello", seq);
+        test_str("%s", "w", pseq);
+        test_val("%d", 2, ret);
+        free(pseq);
+
+        ret = posix_sscanf(
+            "\n\n\th-e-l-l-o world-]    \n",
+            " %9[-eh-o] %m[^]-]",
+            scanset, &pscanset);
+        test_str("%s", "h-e-l-l-o", scanset);
+        test_str("%s", "world", pscanset);
+        test_val("%d", 2, ret);
+        free(pscanset);
+
+        printf("Failed: %d\n", fail);
+}
+
+#endif
+
 /** @}
  */