use fgetwc on wide oriented streams

[libc-test] / src / functional / fwscanf.c

diff --git a/src/functional/fwscanf.c b/src/functional/fwscanf.c
index 70ba50b..18b68e8 100644 (file)
--- a/src/functional/fwscanf.c
+++ b/src/functional/fwscanf.c
@@ -8,21 +8,27 @@
 
 #define TEST(r, f, x, m) ( \
        errno=0, ((r) = (f)) == (x) || \
-       (error("%s failed (" m ")\n", #f, r, x, strerror(errno)), 0) )
+       (t_error("%s failed (" m ")\n", #f, r, x, strerror(errno)), 0) )
 
 #define TEST_S(s, x, m) ( \
        !strcmp((s),(x)) || \
-       (error("[%s] != [%s] (%s)\n", s, x, m), 0) )
+       (t_error("[%s] != [%s] (%s)\n", s, x, m), 0) )
 
 static FILE *writetemp(const char *data)
 {
        FILE *f = tmpfile();
+       size_t n = strlen(data);
        if (!f) return 0;
-       if (!fwrite(data, strlen(data), 1, f)) {
+       if (write(fileno(f), data, n) != n) {
+               t_error("write: %s\n", strerror(errno));
+               fclose(f);
+               return 0;
+       }
+       if (lseek(fileno(f), 0, SEEK_SET) != 0) {
+               t_error("lseek: %s\n", strerror(errno));
                fclose(f);
                return 0;
        }
-       rewind(f);
        return f;
 }
 
@@ -54,7 +60,7 @@ int main(void)
                TEST(i, y, 12, "%d != %d");
                TEST(i, ftell(f), 12, "%d != %d");
                TEST(i, feof(f), 0, "%d != %d");
-               TEST(i, fgetc(f), 'x', "%d != %d");
+               TEST(i, fgetwc(f), 'x', "%d != %d");
                fclose(f);
        }
 
@@ -68,10 +74,10 @@ int main(void)
                TEST(i, y, -1, "%d != %d");
                TEST(i, ftell(f), 4, "%d != %d");
                TEST(i, feof(f), 0, "%d != %d");
-               TEST(i, fgetc(f), ' ', "%d != %d");
+               TEST(i, fgetwc(f), ' ', "%d != %d");
                rewind(f);
-               TEST(i, fgetc(f), '0', "%d != %d");
-               TEST(i, fgetc(f), 'x', "%d != %d");
+               TEST(i, fgetwc(f), '0', "%d != %d");
+               TEST(i, fgetwc(f), 'x', "%d != %d");
                TEST(i, fwscanf(f, L"%lf%n%c %d", &u, &x, a, &y), 3, "%d != %d");
                TEST(u, u, 1.0, "%g != %g");
                TEST(i, x, 1, "%d != %d");
@@ -106,5 +112,5 @@ int main(void)
                fclose(f);
        }
 
-       return test_status;
+       return t_status;
 }