summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-06-07 23:47:37 +1000
committerDarren Tucker <dtucker@dtucker.net>2019-06-07 23:47:37 +1000
commit182898192d4b720e4faeafd5b39c2cfb3b92aa21 (patch)
treee35fab885749a2c47d3bc01156e36929fa4eb9d3
parentd220b675205185e0b4d6b6524acc2e5c599ef0e2 (diff)
Update utimensat test.
POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW should update the symlink and not the destination. The compat code doesn't have a way to do this, so where possible it fails instead of following a symlink when explicitly asked not to. Instead of checking for an explicit failure, check that it does not update the destination, which both the real and compat implmentations should honour. Inspired by github pull req #125 from chutzpah at gentoo.org.
-rw-r--r--openbsd-compat/regress/utimensattest.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/openbsd-compat/regress/utimensattest.c b/openbsd-compat/regress/utimensattest.c
index a7bc7634b..b29cef2f1 100644
--- a/openbsd-compat/regress/utimensattest.c
+++ b/openbsd-compat/regress/utimensattest.c
@@ -83,14 +83,28 @@ main(void)
83 fail("mtim.tv_nsec", 45678000, sb.st_mtim.tv_nsec); 83 fail("mtim.tv_nsec", 45678000, sb.st_mtim.tv_nsec);
84#endif 84#endif
85 85
86 /*
87 * POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW
88 * should update the symlink and not the destination. The compat
89 * code doesn't have a way to do this, so where possible it fails
90 * with ENOSYS instead of following a symlink when explicitly asked
91 * not to. Here we just test that it does not update the destination.
92 */
86 if (rename(TMPFILE, TMPFILE2) == -1) 93 if (rename(TMPFILE, TMPFILE2) == -1)
87 fail("rename", 0, 0); 94 fail("rename", 0, 0);
88 if (symlink(TMPFILE2, TMPFILE) == -1) 95 if (symlink(TMPFILE2, TMPFILE) == -1)
89 fail("symlink", 0, 0); 96 fail("symlink", 0, 0);
97 ts[0].tv_sec = 11223344;
98 ts[1].tv_sec = 55667788;
99 (void)utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW);
100 if (stat(TMPFILE2, &sb) == -1)
101 fail("stat", 0, 0 );
102 if (sb.st_atime == 11223344)
103 fail("utimensat symlink st_atime", 0, 0 );
104 if (sb.st_mtime == 55667788)
105 fail("utimensat symlink st_mtime", 0, 0 );
90 106
91 if (utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW) != -1) 107 /* Clean up */
92 fail("utimensat followed symlink", 0, 0);
93
94 if (!(unlink(TMPFILE) == 0 && unlink(TMPFILE2) == 0)) 108 if (!(unlink(TMPFILE) == 0 && unlink(TMPFILE2) == 0))
95 fail("unlink", 0, 0); 109 fail("unlink", 0, 0);
96 exit(0); 110 exit(0);