From 046f451676fc9ea165b5301ace17f9024ad05ded Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 20 Jan 2006 23:24:42 +0000 Subject: [PATCH] * io/Makefile (tests): Add tst-symlinkat, tst-linkat, tst-readlinkat, tst-mkdirat, tst-mknodat, and tst-mkfifoat. * io/tst-mkdirat.c: New file. * io/tst-mknodat.c: New file. * io/tst-mkfifoat.c: New file. --- ChangeLog | 7 +- io/Makefile | 3 +- io/tst-mkdirat.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ io/tst-mkfifoat.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ io/tst-mknodat.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 493 insertions(+), 3 deletions(-) create mode 100644 io/tst-mkdirat.c create mode 100644 io/tst-mkfifoat.c create mode 100644 io/tst-mknodat.c diff --git a/ChangeLog b/ChangeLog index 5a47303403..4c249e6057 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,14 @@ * sysdeps/unix/sysv/linux/faccessat.c (faccessat): Try using the syscall in more cases. - * io/Makefile (tests): Add tst-symlinkat, tst-linkat, and - tst-readlinkat. + * io/Makefile (tests): Add tst-symlinkat, tst-linkat, tst-readlinkat, + tst-mkdirat, tst-mknodat, and tst-mkfifoat. * io/tst-symlinkat.c: New file. * io/tst-linkat.c: New file. * io/tst-readlinkat.c: New file. + * io/tst-mkdirat.c: New file. + * io/tst-mknodat.c: New file. + * io/tst-mkfifoat.c: New file. * dirent/Makefile (tests): Add tst-fdopendir2. * dirent/tst-fdopendir2.c: New file. diff --git a/io/Makefile b/io/Makefile index 6458a3405f..895b3e3a73 100644 --- a/io/Makefile +++ b/io/Makefile @@ -65,7 +65,8 @@ tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 bug-ftw4 tst-statvfs \ tst-openat tst-unlinkat tst-fstatat tst-futimesat \ tst-renameat tst-fchownat tst-fchmodat tst-faccessat \ - tst-symlinkat tst-linkat tst-readlinkat + tst-symlinkat tst-linkat tst-readlinkat tst-mkdirat \ + tst-mknodat tst-mkfifoat distribute := ftwtest-sh diff --git a/io/tst-mkdirat.c b/io/tst-mkdirat.c new file mode 100644 index 0000000000..3efa4622ef --- /dev/null +++ b/io/tst-mkdirat.c @@ -0,0 +1,162 @@ +#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) +{ + size_t test_dir_len = strlen (test_dir); + static const char dir_name[] = "/tst-mkdirat.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); + } +} + + +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; + } + + /* The directory should be empty safe the . and .. files. */ + DIR *dir = fdopendir (dupfd); + if (dir == NULL) + { + puts ("fdopendir failed"); + return 1; + } + struct dirent64 *d; + while ((d = readdir64 (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); + + /* Create a new directory. */ + int e = mkdirat (dir_fd, "some-dir", 0777); + if (e == -1) + { + if (errno == ENOSYS) + { + puts ("*at functions not supported"); + return 0; + } + + puts ("directory creation failed"); + return 1; + } + + struct stat64 st1; + if (fstatat64 (dir_fd, "some-dir", &st1, 0) != 0) + { + puts ("fstat64 failed"); + return 1; + } + if (!S_ISDIR (st1.st_mode)) + { + puts ("mkdirat did not create a directory"); + return 1; + } + + 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; + } + + dir = fdopendir (dupfd); + if (dir == NULL) + { + puts ("2nd fdopendir failed"); + return 1; + } + bool has_some_dir = false; + while ((d = readdir64 (dir)) != NULL) + if (strcmp (d->d_name, "some-dir") == 0) + { + has_some_dir = true; +#ifdef _DIRENT_HAVE_D_TYPE + if (d->d_type != DT_UNKNOWN && d->d_type != DT_DIR) + { + puts ("d_type for some-dir wrong"); + return 1; + } +#endif + } + else 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); + + if (!has_some_dir) + { + puts ("some-dir not in directory list"); + return 1; + } + + if (unlinkat (dir_fd, "some-dir", AT_REMOVEDIR) != 0) + { + puts ("unlinkat failed"); + return 1; + } + + close (dir_fd); + + return 0; +} diff --git a/io/tst-mkfifoat.c b/io/tst-mkfifoat.c new file mode 100644 index 0000000000..2bf29f63af --- /dev/null +++ b/io/tst-mkfifoat.c @@ -0,0 +1,162 @@ +#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) +{ + size_t test_dir_len = strlen (test_dir); + static const char dir_name[] = "/tst-mkfifoat.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); + } +} + + +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; + } + + /* The directory should be empty safe the . and .. files. */ + DIR *dir = fdopendir (dupfd); + if (dir == NULL) + { + puts ("fdopendir failed"); + return 1; + } + struct dirent64 *d; + while ((d = readdir64 (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); + + /* Create a new directory. */ + int e = mkfifoat (dir_fd, "some-fifo", 0777); + if (e == -1) + { + if (errno == ENOSYS) + { + puts ("*at functions not supported"); + return 0; + } + + puts ("fifo creation failed"); + return 1; + } + + struct stat64 st1; + if (fstatat64 (dir_fd, "some-fifo", &st1, 0) != 0) + { + puts ("fstat64 failed"); + return 1; + } + if (!S_ISFIFO (st1.st_mode)) + { + puts ("mkfifoat did not create FIFO"); + return 1; + } + + 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; + } + + dir = fdopendir (dupfd); + if (dir == NULL) + { + puts ("2nd fdopendir failed"); + return 1; + } + bool has_some_fifo = false; + while ((d = readdir64 (dir)) != NULL) + if (strcmp (d->d_name, "some-fifo") == 0) + { + has_some_fifo = true; +#ifdef _DIRENT_HAVE_D_TYPE + if (d->d_type != DT_UNKNOWN && d->d_type != DT_FIFO) + { + puts ("d_type for some-fifo wrong"); + return 1; + } +#endif + } + else 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); + + if (!has_some_fifo) + { + puts ("some-fifo not in directory list"); + return 1; + } + + if (unlinkat (dir_fd, "some-fifo", 0) != 0) + { + puts ("unlinkat failed"); + return 1; + } + + close (dir_fd); + + return 0; +} diff --git a/io/tst-mknodat.c b/io/tst-mknodat.c new file mode 100644 index 0000000000..9158c0dfd4 --- /dev/null +++ b/io/tst-mknodat.c @@ -0,0 +1,162 @@ +#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) +{ + size_t test_dir_len = strlen (test_dir); + static const char dir_name[] = "/tst-mknodat.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); + } +} + + +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; + } + + /* The directory should be empty safe the . and .. files. */ + DIR *dir = fdopendir (dupfd); + if (dir == NULL) + { + puts ("fdopendir failed"); + return 1; + } + struct dirent64 *d; + while ((d = readdir64 (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); + + /* Create a new directory. */ + int e = mknodat (dir_fd, "some-sock", 0777 | S_IFSOCK, 0); + if (e == -1) + { + if (errno == ENOSYS) + { + puts ("*at functions not supported"); + return 0; + } + + puts ("socket creation failed"); + return 1; + } + + struct stat64 st1; + if (fstatat64 (dir_fd, "some-sock", &st1, 0) != 0) + { + puts ("fstat64 failed"); + return 1; + } + if (!S_ISSOCK (st1.st_mode)) + { + puts ("mknodat did not create a Unix domain socket"); + return 1; + } + + 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; + } + + dir = fdopendir (dupfd); + if (dir == NULL) + { + puts ("2nd fdopendir failed"); + return 1; + } + bool has_some_sock = false; + while ((d = readdir64 (dir)) != NULL) + if (strcmp (d->d_name, "some-sock") == 0) + { + has_some_sock = true; +#ifdef _DIRENT_HAVE_D_TYPE + if (d->d_type != DT_UNKNOWN && d->d_type != DT_SOCK) + { + puts ("d_type for some-sock wrong"); + return 1; + } +#endif + } + else 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); + + if (!has_some_sock) + { + puts ("some-sock not in directory list"); + return 1; + } + + if (unlinkat (dir_fd, "some-sock", 0) != 0) + { + puts ("unlinkat failed"); + return 1; + } + + close (dir_fd); + + return 0; +}