tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always clean up before and after utimensat test.

This commit is contained in:
Darren Tucker 2019-06-08 00:03:07 +10:00
parent 182898192d
commit 2b3402dc9f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openbsd-compat/regress/utimensattest.c
View File

@ -33,7 +33,14 @@
int utimensat(int, const char *, const struct timespec[2], int); int utimensat(int, const char *, const struct timespec[2], int);
void static void
cleanup(void)
{
(void)unlink(TMPFILE);
(void)unlink(TMPFILE2);
}
static void
fail(char *msg, long expect, long got) fail(char *msg, long expect, long got)
{ {
int saved_errno = errno; int saved_errno = errno;
@ -44,6 +51,7 @@ fail(char *msg, long expect, long got)
else else
fprintf(stderr, "utimensat: %s: expected %ld got %ld\n", fprintf(stderr, "utimensat: %s: expected %ld got %ld\n",
msg, expect, got); msg, expect, got);
cleanup();
exit(1); exit(1);
} }
@ -54,6 +62,7 @@ main(void)
struct stat sb; struct stat sb;
struct timespec ts[2]; struct timespec ts[2];
cleanup();
if ((fd = open(TMPFILE, O_CREAT, 0600)) == -1) if ((fd = open(TMPFILE, O_CREAT, 0600)) == -1)
fail("open", 0, 0); fail("open", 0, 0);
close(fd); close(fd);
@ -87,8 +96,8 @@ main(void)
* POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW * POSIX specifies that when given a symlink, AT_SYMLINK_NOFOLLOW
* should update the symlink and not the destination. The compat * should update the symlink and not the destination. The compat
* code doesn't have a way to do this, so where possible it fails * code doesn't have a way to do this, so where possible it fails
* with ENOSYS instead of following a symlink when explicitly asked * with instead of following a symlink when explicitly asked not to.
* not to. Here we just test that it does not update the destination. * Here we just test that it does not update the destination.
*/ */
if (rename(TMPFILE, TMPFILE2) == -1) if (rename(TMPFILE, TMPFILE2) == -1)
fail("rename", 0, 0); fail("rename", 0, 0);
@ -104,8 +113,6 @@ main(void)
if (sb.st_mtime == 55667788) if (sb.st_mtime == 55667788)
fail("utimensat symlink st_mtime", 0, 0 ); fail("utimensat symlink st_mtime", 0, 0 );
/* Clean up */ cleanup();
if (!(unlink(TMPFILE) == 0 && unlink(TMPFILE2) == 0))
fail("unlink", 0, 0);
exit(0); exit(0);
} }