add several tests that were lying around in my tree, and new stat() tests

5 files changed, 251 insertions, 0 deletions

diff --git a/fscanf.c b/fscanf.c
index b03589a..6eee68f 100644
--- a/fscanf.c
+++ b/fscanf.c
@@ -12,9 +12,22 @@
 !strcmp((s),(x)) || \
 (printf(__FILE__ ":%d: [%s] != [%s] (%s)\n", __LINE__, s, x, m), err++, 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 test_fscanf(void)
 {
 	int i, x, y;
+	double u, v;
 	int err=0;
 	char a[100], b[100], *s;
 	FILE *f;
@@ -43,5 +56,78 @@ int test_fscanf(void)
 	fclose(f);
 	close(p[1]);
 
+	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 err;
 }
diff --git a/fwscanf.c b/fwscanf.c
new file mode 100644
index 0000000..52d12d2
--- /dev/null
+++ b/fwscanf.c
@@ -0,0 +1,111 @@
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <limits.h>
+#include <unistd.h>
+#include <wchar.h>
+
+#define TEST(r, f, x, m) ( \
+((r) = (f)) == (x) || \
+(printf(__FILE__ ":%d: %s failed (" m ")\n", __LINE__, #f, r, x, strerror(errno)), err++, 0) )
+
+#define TEST_S(s, x, m) ( \
+!strcmp((s),(x)) || \
+(printf(__FILE__ ":%d: [%s] != [%s] (%s)\n", __LINE__, s, x, m), err++, 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 test_fwscanf(void)
+{
+	int i, x, y;
+	double u, v;
+	int err=0;
+	char a[100], b[100], *s;
+	FILE *f;
+	int p[2];
+
+	TEST(i, !!(f=writetemp("      42")), 1, "failed to make temp file");
+	if (f) {
+		x=y=-1;
+		TEST(i, fwscanf(f, L" %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, fwscanf(f, L"%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, fwscanf(f, L"%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, 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");
+		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, fwscanf(f, L"%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, fwscanf(f, L"%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 err;
+}
diff --git a/stat.c b/stat.c
new file mode 100644
index 0000000..fcf064e
--- /dev/null
+++ b/stat.c
@@ -0,0 +1,46 @@
+#include <sys/stat.h>
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <time.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#define TEST2(c, l, ...) ((c) ? 1 : \
+(err++,printf(__FILE__":"#l": "#c" failed: " __VA_ARGS__),putchar('\n'),0))
+#define TEST1(c, l, ...) TEST2(c, l, __VA_ARGS__)
+#define TEST(c, ...) TEST1(c, __LINE__, __VA_ARGS__)
+
+int test_stat(void)
+{
+	int err = 0;
+	struct stat st;
+	FILE *f;
+	time_t t;
+
+	if (TEST(stat(".",&st)==0, "errno = %s", strerror(errno))) {
+		TEST(S_ISDIR(st.st_mode), "");
+		TEST(st.st_nlink>0, "%ju", (uintmax_t)st.st_nlink);
+		t = time(0);
+		TEST(st.st_ctime<=t, "%jd > %jd", (intmax_t)st.st_ctime, (intmax_t)t);
+		TEST(st.st_mtime<=t, "%jd > %jd", (intmax_t)st.st_mtime, (intmax_t)t);
+		TEST(st.st_atime<=t, "%jd > %jd", (intmax_t)st.st_atime, (intmax_t)t);
+	}
+
+	if (TEST(stat("/dev/null",&st)==0, "errno = %s", strerror(errno))) {
+		TEST(S_ISCHR(st.st_mode), "");
+	}
+
+	if ((f = tmpfile())) {
+		fputs("hello", f);
+		fflush(f);
+		if (TEST(fstat(fileno(f),&st)==0, "errnp = %s", strerror(errno))) {
+			TEST(st.st_uid==geteuid(), "%d vs %d", (int)st.st_uid, (int)geteuid());
+			TEST(st.st_gid==getegid(), "%d vs %d", (int)st.st_uid, (int)geteuid());
+			TEST(st.st_size==5, "%jd vs 5", (intmax_t)st.st_size);
+		}
+		fclose(f);
+	}
+
+	return err;
+}
diff --git a/strtol.c b/strtol.c
index 09af1c9..096d724 100644
--- a/strtol.c
+++ b/strtol.c
@@ -82,5 +82,11 @@ int test_strtol(void)
 	TEST2(i, c-s, 0, "wrong final position %d != %d");
 	TEST2(i, errno, EINVAL, "%d != %d");
 
+	TEST(l, strtol(s="  15437", &c, 8), 015437, "%ld != %ld");
+	TEST2(i, c-s, 7, "wrong final position %d != %d");
+
+	TEST(l, strtol(s="  1", &c, 0), 1, "%ld != %ld");
+	TEST2(i, c-s, 3, "wrong final position %d != %d");
+
 	return err;
 }
diff --git a/testsuite.c b/testsuite.c
index a4761cc..d8bd773 100644
--- a/testsuite.c
+++ b/testsuite.c
@@ -22,11 +22,13 @@ int main()
 	RUN_TEST(sscanf);
 	RUN_TEST(snprintf);
 	RUN_TEST(swprintf);
+	RUN_TEST(stat);
 	RUN_TEST(string);
 	RUN_TEST(strtod);
 	RUN_TEST(strtol);
 	RUN_TEST(ungetc);
 	RUN_TEST(wcstol);
+	RUN_TEST(fwscanf);
 	RUN_TEST(basename);
 	RUN_TEST(dirname);
 	RUN_TEST(memstream);