From ea75860813234d13b5757d1fd2b182cdb1ba1255 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Tue, 8 Oct 2024 21:09:43 -0400 Subject: [PATCH] tst-faccessat.c: Port to libsupport Use libsupport convenience functions and macros instead of the old test-skeleton. Also add a new xdup() convenience wrapper function. Signed-off-by: Siddhesh Poyarekar Reviewed-by: Adhemerval Zanella --- io/tst-faccessat.c | 219 +++++++++++++-------------------------------- 1 file changed, 64 insertions(+), 155 deletions(-) diff --git a/io/tst-faccessat.c b/io/tst-faccessat.c index b90954e318..b980ca3fa2 100644 --- a/io/tst-faccessat.c +++ b/io/tst-faccessat.c @@ -1,6 +1,23 @@ -/* Test for faccessat function. */ +/* Test for faccessat function. + Copyright (C) 2006-2024 Free Software Foundation, Inc. + Copyright The GNU Toolchain Authors. + This file is part of the GNU C Library. -#include + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include #include #include #include @@ -8,47 +25,19 @@ #include #include +#include +#include +#include +#include #include -static void prepare (void); -#define PREPARE(argc, argv) prepare () - -static int do_test (void); -#define TEST_FUNCTION do_test () - -#include "../test-skeleton.c" - static int dir_fd; static void -prepare (void) +prepare (int argc, char **argv) { - size_t test_dir_len = strlen (test_dir); - static const char dir_name[] = "/tst-faccessat.XXXXXX"; - - size_t dirbuflen = test_dir_len + sizeof (dir_name); - char *dirbuf = malloc (dirbuflen); - if (dirbuf == NULL) - { - puts ("out of memory"); - exit (1); - } - - snprintf (dirbuf, dirbuflen, "%s%s", test_dir, dir_name); - if (mkdtemp (dirbuf) == NULL) - { - puts ("cannot create temporary directory"); - exit (1); - } - - add_temp_file (dirbuf); - - dir_fd = open (dirbuf, O_RDONLY | O_DIRECTORY); - if (dir_fd == -1) - { - puts ("cannot open directory"); - exit (1); - } + dir_fd = xopen (support_create_temp_directory ("tst-faccessat."), + O_RDONLY | O_DIRECTORY, 0); } @@ -56,159 +45,79 @@ static int do_test (void) { /* fdopendir takes over the descriptor, make a copy. */ - int dupfd = dup (dir_fd); - if (dupfd == -1) - { - puts ("dup failed"); - return 1; - } - if (lseek (dupfd, 0, SEEK_SET) != 0) - { - puts ("1st lseek failed"); - return 1; - } + int dupfd = xdup (dir_fd); + xlseek (dupfd, 0, SEEK_SET); /* The directory should be empty save the . and .. files. */ - DIR *dir = fdopendir (dupfd); - if (dir == NULL) - { - puts ("fdopendir failed"); - return 1; - } + DIR *dir = xfdopendir (dupfd); + struct dirent64 *d; - while ((d = readdir64 (dir)) != NULL) + while ((d = xreaddir64 (dir)) != NULL) if (strcmp (d->d_name, ".") != 0 && strcmp (d->d_name, "..") != 0) - { - printf ("temp directory contains file \"%s\"\n", d->d_name); - return 1; - } - closedir (dir); + FAIL_EXIT1 ("temp directory contains file \"%s\"\n", d->d_name); + xclosedir (dir); /* Try to create a file. */ int fd = openat (dir_fd, "some-file", O_CREAT|O_RDWR|O_EXCL, 0666); if (fd == -1) { if (errno == ENOSYS) - { - puts ("*at functions not supported"); - return 0; - } + FAIL_UNSUPPORTED ("*at functions not supported"); - puts ("file creation failed"); - return 1; + FAIL_EXIT1 ("file creation failed"); } xwrite (fd, "hello", 5); puts ("file created"); /* Before closing the file, try using this file descriptor to open another file. This must fail. */ - if (faccessat (fd, "should-not-work", F_OK, AT_EACCESS) != -1) - { - puts ("faccessat using descriptor for normal file worked"); - return 1; - } - if (errno != ENOTDIR) - { - puts ("\ -error for faccessat using descriptor for normal file not ENOTDIR "); - return 1; - } + TEST_VERIFY_EXIT (faccessat (fd, "should-not-work", F_OK, AT_EACCESS) == -1); + TEST_VERIFY_EXIT (errno == ENOTDIR); - close (fd); + xclose (fd); - int result = 0; - - if (faccessat (dir_fd, "some-file", F_OK, AT_EACCESS)) - { - printf ("faccessat F_OK: %m\n"); - result = 1; - } - if (faccessat (dir_fd, "some-file", W_OK, AT_EACCESS)) - { - printf ("faccessat W_OK: %m\n"); - result = 1; - } + TEST_VERIFY (faccessat (dir_fd, "some-file", F_OK, AT_EACCESS) == 0); + TEST_VERIFY (faccessat (dir_fd, "some-file", W_OK, AT_EACCESS) == 0); errno = 0; - if (faccessat (dir_fd, "some-file", X_OK, AT_EACCESS) == 0 - || errno != EACCES) - { - printf ("faccessat X_OK on nonexecutable: %m\n"); - result = 1; - } + if (faccessat (dir_fd, "some-file", X_OK, AT_EACCESS) != 0) + TEST_COMPARE (errno, EACCES); + else + FAIL ("faccessat unexpectedly succeeded\n"); if (fchmodat (dir_fd, "some-file", 0400, 0) != 0) - { - printf ("fchownat failed: %m\n"); - return 1; - } + FAIL_EXIT1 ("fchownat failed: %m\n"); - if (faccessat (dir_fd, "some-file", R_OK, AT_EACCESS)) - { - printf ("faccessat R_OK: %m\n"); - result = 1; - } + TEST_VERIFY (faccessat (dir_fd, "some-file", R_OK, AT_EACCESS) == 0); + /* Write would succeed only for EUID root, otherwise this test should + fail. */ errno = 0; - if (faccessat (dir_fd, "some-file", W_OK, AT_EACCESS) == 0 - ? (geteuid () != 0) : (errno != EACCES)) - { - printf ("faccessat W_OK on unwritable file: %m\n"); - result = 1; - } + TEST_VERIFY (faccessat (dir_fd, "some-file", W_OK, AT_EACCESS) == 0 + ? (geteuid () == 0) : (errno == EACCES)); /* Create a file descriptor which is closed again right away. */ - int dir_fd2 = dup (dir_fd); - if (dir_fd2 == -1) - { - puts ("dup failed"); - return 1; - } + int dir_fd2 = xdup (dir_fd); close (dir_fd2); /* With the file descriptor closed the next call must fail. */ - if (faccessat (dir_fd2, "some-file", F_OK, AT_EACCESS) != -1) - { - puts ("faccessat using closed descriptor succeeded"); - return 1; - } - if (errno != EBADF) - { - puts ("faccessat using closed descriptor did not set EBADF"); - return 1; - } + TEST_VERIFY_EXIT (faccessat (dir_fd2, "some-file", F_OK, AT_EACCESS) + == -1); + TEST_VERIFY_EXIT (errno == EBADF); /* Same with a non-existing file. */ - if (faccessat (dir_fd2, "non-existing-file", F_OK, AT_EACCESS) != -1) - { - puts ("2nd faccessat using closed descriptor succeeded"); - return 1; - } - if (errno != EBADF) - { - puts ("2nd faccessat using closed descriptor did not set EBADF"); - return 1; - } + TEST_VERIFY_EXIT (faccessat (dir_fd2, "non-existing-file", F_OK, AT_EACCESS) + == -1); + TEST_VERIFY_EXIT (errno == EBADF); - if (unlinkat (dir_fd, "some-file", 0) != 0) - { - puts ("unlinkat failed"); - result = 1; - } + TEST_VERIFY (unlinkat (dir_fd, "some-file", 0) == 0); - close (dir_fd); + xclose (dir_fd); - fd = faccessat (-1, "some-file", F_OK, AT_EACCESS); - if (fd != -1) - { - puts ("faccessat using -1 descriptor succeeded"); - return 1; - } - if (errno != EBADF) - { - puts ("faccessat using -1 descriptor did not set EBADF"); - return 1; - } + TEST_VERIFY_EXIT (faccessat (-1, "some-file", F_OK, AT_EACCESS) == -1); + TEST_VERIFY_EXIT (errno == EBADF); - return result; + return 0; } +#define PREPARE prepare +#include