From 589b158050a258a0ab1b2571bdfe1bf757a05575 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 3 Oct 2023 19:06:00 +0200 Subject: [PATCH] faccessat tests: Strengthen tests. * tests/test-faccessat.c (main): Test other modes than F_OK. Check errno values. --- ChangeLog | 6 ++++++ tests/test-faccessat.c | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/ChangeLog b/ChangeLog index 95c08b304e..0e7896212c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-10-03 Bruno Haible + + faccessat tests: Strengthen tests. + * tests/test-faccessat.c (main): Test other modes than F_OK. Check errno + values. + 2023-10-03 Bruno Haible euidaccess: Reject trailing slashes on symlinks to non-directories. diff --git a/tests/test-faccessat.c b/tests/test-faccessat.c index 5f6ecd95d1..6a6bfeef53 100644 --- a/tests/test-faccessat.c +++ b/tests/test-faccessat.c @@ -45,12 +45,22 @@ main (void) } /* Test behavior with trailing slash. */ + unlink (BASE "file"); ASSERT (faccessat (AT_FDCWD, ".", X_OK, 0) == 0); ASSERT (faccessat (AT_FDCWD, "./", X_OK, 0) == 0); ASSERT (close (open (BASE "file", O_CREAT | O_WRONLY, 0)) == 0); ASSERT (faccessat (AT_FDCWD, BASE "file", F_OK, 0) == 0); + ASSERT (faccessat (AT_FDCWD, BASE "file/", F_OK, 0) != 0); + ASSERT (errno == ENOTDIR); + ASSERT (faccessat (AT_FDCWD, BASE "file/", R_OK, 0) != 0); + ASSERT (errno == ENOTDIR); + ASSERT (faccessat (AT_FDCWD, BASE "file/", W_OK, 0) != 0); + ASSERT (errno == ENOTDIR); + ASSERT (faccessat (AT_FDCWD, BASE "file/", X_OK, 0) != 0); + ASSERT (errno == ENOTDIR); + unlink (BASE "link1"); if (symlink (".", BASE "link1") == 0) { @@ -61,12 +71,27 @@ main (void) ASSERT (symlink (BASE "file", BASE "link2") == 0); ASSERT (faccessat (AT_FDCWD, BASE "link2", F_OK, 0) == 0); ASSERT (faccessat (AT_FDCWD, BASE "link2/", F_OK, 0) != 0); + ASSERT (errno == ENOTDIR); + ASSERT (faccessat (AT_FDCWD, BASE "link2/", R_OK, 0) != 0); + ASSERT (errno == ENOTDIR || errno == EACCES); + ASSERT (faccessat (AT_FDCWD, BASE "link2/", W_OK, 0) != 0); + ASSERT (errno == ENOTDIR || errno == EACCES); + ASSERT (faccessat (AT_FDCWD, BASE "link2/", X_OK, 0) != 0); + ASSERT (errno == ENOTDIR || errno == EACCES); unlink (BASE "link2"); unlink (BASE "link3"); ASSERT (symlink (BASE "no-such-file", BASE "link3") == 0); ASSERT (faccessat (AT_FDCWD, BASE "link3", F_OK, 0) != 0); + ASSERT (errno == ENOENT); ASSERT (faccessat (AT_FDCWD, BASE "link3/", F_OK, 0) != 0); + ASSERT (errno == ENOENT); + ASSERT (faccessat (AT_FDCWD, BASE "link3/", R_OK, 0) != 0); + ASSERT (errno == ENOENT); + ASSERT (faccessat (AT_FDCWD, BASE "link3/", W_OK, 0) != 0); + ASSERT (errno == ENOENT); + ASSERT (faccessat (AT_FDCWD, BASE "link3/", X_OK, 0) != 0); + ASSERT (errno == ENOENT); unlink (BASE "link3"); } unlink (BASE "link1"); -- 2.39.5