X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ffunctional%2Ffscanf.c;h=17fdb64143c50b62bfaf473128cb970cf549c343;hb=cfa23cc1bd01f5c44d7746b8b1839f84d5e1b6eb;hp=62627b7fc54cd312d4b76c2056e6e2e50ba82395;hpb=2cf89517c5b25c2524fe0c0c01ed277d7307a852;p=libc-test

diff --git a/src/functional/fscanf.c b/src/functional/fscanf.c
index 62627b7..17fdb64 100644
--- a/src/functional/fscanf.c
+++ b/src/functional/fscanf.c
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -6,46 +5,129 @@
 #include <unistd.h>
 #include "test.h"
 
-#define T(f, x, m) do { \
-	r = (f); \
-	if (r != (x)) \
-		error("%s failed (got %d, expected %d, errno \"%s\") (%s)\n", \
-			#f, r, x, errno ? strerror(errno) : "", m); \
-	errno = 0; \
-} while (0)
+#define TEST(r, f, x, m) ( \
+	errno=0, ((r) = (f)) == (x) || \
+	(t_error("%s failed (" m ")\n", #f, r, x, strerror(errno)), 0) )
 
-#define S(s, x, m) do { \
-	if (strcmp(s, x) != 0) \
-		error("got [%s] want [%s] (%s)\n", s, x, m); \
-} while(0)
+#define TEST_S(s, x, m) ( \
+	!strcmp((s),(x)) || \
+	(t_error("[%s] != [%s] (%s)\n", s, x, m), 0) )
+
+static FILE *writetemp(const char *data)
+{
+	FILE *f = tmpfile();
+	if (!f) return 0;
+	if (!fwrite(data, strlen(data), 1, f)) {
+		fclose(f);
+		return 0;
+	}
+	rewind(f);
+	return f;
+}
 
 int main(void)
 {
-	int r, x, y;
+	int i, x, y;
+	double u;
 	char a[100], b[100];
-	int p[2];
 	FILE *f;
+	int p[2];
+
+	TEST(i, pipe(p), 0, "failed to open pipe %d!=%d (%s)");
+	TEST(i, !(f = fdopen(p[0], "rb")), 0, "failed to fdopen pipe %d!=%d (%s)");
 
-	T(pipe(p), 0, "open pipe");
-	T(!(f = fdopen(p[0], "rb")), 0, "fdopen pipe");
 	if (!f) {
 		close(p[0]);
 		close(p[1]);
-		return test_status;
+		return 1;
 	}
 
-	T(write(p[1], "hello, world\n", 13), 13, "write to pipe");
-	T(fscanf(f, "%s %[own]", a, b), 2, "");
-	S(a, "hello,", "wrong result for %s");
-	S(b, "wo", "wrong result for %[own]");
-	T(fgetc(f), 'r', "fgetc 'r'");
+	TEST(i, write(p[1], "hello, world\n", 13), 13, "write error %d!=%d (%s)");
+	TEST(i, fscanf(f, "%s %[own]", a, b), 2, "got %d fields, expected %d");
+	TEST_S(a, "hello,", "wrong result for %s");
+	TEST_S(b, "wo", "wrong result for %[own]");
+	TEST(i, fgetc(f), 'r', "'%c' != '%c') (%s)");
 
-	T(write(p[1], " 0x12 0x34", 10), 10, "");
-	T(fscanf(f, "ld %5i%2i", &x, &y), 1, "");
-	T(x, 0x12, "");
-	T(fgetc(f), '3', "fgetc '3'");
+	TEST(i, write(p[1], " 0x12 0x34", 10), 10, "write error %d!=%d (%s)");
+	TEST(i, fscanf(f, "ld %5i%2i", &x, &y), 1, "got %d fields, expected %d");
+	TEST(i, x, 0x12, "%d != %d");
+	TEST(i, fgetc(f), '3', "'%c' != '%c'");
 
 	fclose(f);
 	close(p[1]);
-	return test_status;
+
+	TEST(i, !!(f=writetemp("      42")), 1, "failed to make temp file");
+	if (f) {
+		x=y=-1;
+		TEST(i, fscanf(f, " %n%*d%n", &x, &y), 0, "%d != %d");
+		TEST(i, x, 6, "%d != %d");
+		TEST(i, y, 8, "%d != %d");
+		TEST(i, ftell(f), 8, "%d != %d");
+		TEST(i, !!feof(f), 1, "%d != %d");
+		fclose(f);
+	}
+
+	TEST(i, !!(f=writetemp("[abc123]....x")), 1, "failed to make temp file");
+	if (f) {
+		x=y=-1;
+		TEST(i, fscanf(f, "%10[^]]%n%10[].]%n", a, &x, b, &y), 2, "%d != %d");
+		TEST_S(a, "[abc123", "wrong result for %[^]]");
+		TEST_S(b, "]....", "wrong result for %[].]");
+		TEST(i, x, 7, "%d != %d");
+		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");
+		fclose(f);
+	}
+
+	TEST(i, !!(f=writetemp("0x1p 12")), 1, "failed to make temp file");
+	if (f) {
+		x=y=-1;
+		u=-1;
+		TEST(i, fscanf(f, "%lf%n %d", &u, &x, &y), 0, "%d != %d");
+		TEST(u, u, -1.0, "%g != %g");
+		TEST(i, x, -1, "%d != %d");
+		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");
+		rewind(f);
+		TEST(i, fgetc(f), '0', "%d != %d");
+		TEST(i, fgetc(f), 'x', "%d != %d");
+		TEST(i, fscanf(f, "%lf%n%c %d", &u, &x, a, &y), 3, "%d != %d");
+		TEST(u, u, 1.0, "%g != %g");
+		TEST(i, x, 1, "%d != %d");
+		TEST(i, a[0], 'p', "%d != %d");
+		TEST(i, y, 12, "%d != %d");
+		TEST(i, ftell(f), 7, "%d != %d");
+		TEST(i, !!feof(f), 1, "%d != %d");
+		fclose(f);
+	}
+
+	TEST(i, !!(f=writetemp("0x.1p4    012")), 1, "failed to make temp file");
+	if (f) {
+		x=y=-1;
+		u=-1;
+		TEST(i, fscanf(f, "%lf%n %i", &u, &x, &y), 2, "%d != %d");
+		TEST(u, u, 1.0, "%g != %g");
+		TEST(i, x, 6, "%d != %d");
+		TEST(i, y, 10, "%d != %d");
+		TEST(i, ftell(f), 13, "%d != %d");
+		TEST(i, !!feof(f), 1, "%d != %d");
+		fclose(f);
+	}
+
+	TEST(i, !!(f=writetemp("0xx")), 1, "failed to make temp file");
+	if (f) {
+		x=y=-1;
+		TEST(i, fscanf(f, "%x%n", &x, &y), 0, "%d != %d");
+		TEST(i, x, -1, "%d != %d");
+		TEST(i, y, -1, "%d != %d");
+		TEST(i, ftell(f), 2, "%d != %d");
+		TEST(i, feof(f), 0, "%d != %d");
+		fclose(f);
+	}
+
+	return t_status;
 }