4 files changed, 177 insertions, 7 deletions

diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile
index a967ad5ddf91..8c2151105209 100644
--- a/lib/libc/tests/gen/Makefile
+++ b/lib/libc/tests/gen/Makefile
@@ -20,6 +20,7 @@ ATF_TESTS_C+=		glob2_test
 ATF_TESTS_C+=		glob_blocks_test
 .endif
 ATF_TESTS_C+=		makecontext_test
+ATF_TESTS_C+=		opendir_test
 ATF_TESTS_C+=		popen_test
 ATF_TESTS_C+=		posix_spawn_test
 ATF_TESTS_C+=		realpath2_test
diff --git a/lib/libc/tests/gen/opendir_test.c b/lib/libc/tests/gen/opendir_test.c
new file mode 100644
index 000000000000..b7481255654f
--- /dev/null
+++ b/lib/libc/tests/gen/opendir_test.c
@@ -0,0 +1,145 @@
+/*-
+ * Copyright (c) 2025 Klara, Inc.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <sys/stat.h>
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+/*
+ * Create a directory with a single subdirectory.
+ */
+static void
+opendir_prepare(const struct atf_tc *tc)
+{
+	ATF_REQUIRE_EQ(0, mkdir("dir", 0755));
+	ATF_REQUIRE_EQ(0, mkdir("dir/subdir", 0755));
+}
+
+/*
+ * Assuming dirp represents the directory created by opendir_prepare(),
+ * verify that readdir() returns what we expected to see there.
+ */
+static void
+opendir_check(const struct atf_tc *tc, DIR *dirp)
+{
+	struct dirent *ent;
+
+	ATF_REQUIRE((ent = readdir(dirp)) != NULL);
+	ATF_CHECK_EQ(1, ent->d_namlen);
+	ATF_CHECK_STREQ(".", ent->d_name);
+	ATF_CHECK_EQ(DT_DIR, ent->d_type);
+	ATF_REQUIRE((ent = readdir(dirp)) != NULL);
+	ATF_CHECK_EQ(2, ent->d_namlen);
+	ATF_CHECK_STREQ("..", ent->d_name);
+	ATF_CHECK_EQ(DT_DIR, ent->d_type);
+	ATF_REQUIRE((ent = readdir(dirp)) != NULL);
+	ATF_CHECK_EQ(sizeof("subdir") - 1, ent->d_namlen);
+	ATF_CHECK_STREQ("subdir", ent->d_name);
+	ATF_CHECK_EQ(DT_DIR, ent->d_type);
+	ATF_CHECK(readdir(dirp) == NULL);
+	ATF_CHECK(readdir(dirp) == NULL);
+}
+
+ATF_TC(opendir_ok);
+ATF_TC_HEAD(opendir_ok, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Open a directory.");
+}
+ATF_TC_BODY(opendir_ok, tc)
+{
+	DIR *dirp;
+
+	opendir_prepare(tc);
+	ATF_REQUIRE((dirp = opendir("dir")) != NULL);
+	opendir_check(tc, dirp);
+	ATF_CHECK_EQ(0, closedir(dirp));
+}
+
+ATF_TC(opendir_fifo);
+ATF_TC_HEAD(opendir_fifo, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Do not hang if given a named pipe.");
+}
+ATF_TC_BODY(opendir_fifo, tc)
+{
+	DIR *dirp;
+	int fd;
+
+	ATF_REQUIRE((fd = mkfifo("fifo", 0644)) >= 0);
+	ATF_REQUIRE_EQ(0, close(fd));
+	ATF_REQUIRE((dirp = opendir("fifo")) == NULL);
+	ATF_CHECK_EQ(ENOTDIR, errno);
+}
+
+ATF_TC(fdopendir_ok);
+ATF_TC_HEAD(fdopendir_ok, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Open a directory from a directory descriptor.");
+}
+ATF_TC_BODY(fdopendir_ok, tc)
+{
+	DIR *dirp;
+	int dd;
+
+	opendir_prepare(tc);
+	ATF_REQUIRE((dd = open("dir", O_DIRECTORY | O_RDONLY)) >= 0);
+	ATF_REQUIRE((dirp = fdopendir(dd)) != NULL);
+	opendir_check(tc, dirp);
+	ATF_CHECK_EQ(dd, fdclosedir(dirp));
+	ATF_CHECK_EQ(0, close(dd));
+}
+
+ATF_TC(fdopendir_ebadf);
+ATF_TC_HEAD(fdopendir_ebadf, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Open a directory from an invalid descriptor.");
+}
+ATF_TC_BODY(fdopendir_ebadf, tc)
+{
+	DIR *dirp;
+	int dd;
+
+	ATF_REQUIRE_EQ(0, mkdir("dir", 0755));
+	ATF_REQUIRE((dd = open("dir", O_DIRECTORY | O_RDONLY)) >= 0);
+	ATF_CHECK_EQ(0, close(dd));
+	ATF_REQUIRE((dirp = fdopendir(dd)) == NULL);
+	ATF_CHECK_EQ(EBADF, errno);
+}
+
+ATF_TC(fdopendir_enotdir);
+ATF_TC_HEAD(fdopendir_enotdir, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+	    "Open a directory from a non-directory descriptor.");
+}
+ATF_TC_BODY(fdopendir_enotdir, tc)
+{
+	DIR *dirp;
+	int fd;
+
+	ATF_REQUIRE((fd = open("file", O_CREAT | O_RDWR, 0644)) >= 0);
+	ATF_REQUIRE((dirp = fdopendir(fd)) == NULL);
+	ATF_CHECK_EQ(ENOTDIR, errno);
+	ATF_CHECK_EQ(0, close(fd));
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, opendir_ok);
+	ATF_TP_ADD_TC(tp, fdopendir_ok);
+	ATF_TP_ADD_TC(tp, fdopendir_ebadf);
+	ATF_TP_ADD_TC(tp, fdopendir_enotdir);
+	ATF_TP_ADD_TC(tp, opendir_fifo);
+	return (atf_no_error());
+}
diff --git a/lib/libc/tests/gen/scandir_test.c b/lib/libc/tests/gen/scandir_test.c
index f7b52b5e3616..afd25bf7c0b2 100644
--- a/lib/libc/tests/gen/scandir_test.c
+++ b/lib/libc/tests/gen/scandir_test.c
@@ -157,7 +157,7 @@ ATF_TC_BODY(scandir_error, tc)
 {
 	char path[16];
 	struct dirent **namelist = NULL;
-	int fd, i, ret;
+	int fd, i;
 
 	ATF_REQUIRE_EQ(0, mkdir("dir", 0755));
 	for (i = 0; i < 1024; i++) {
@@ -170,9 +170,8 @@ ATF_TC_BODY(scandir_error, tc)
 	scandir_error_count = 0;
 	scandir_error_fd = fd;
 	scandir_error_select_return = 0;
-	ret = fdscandir(fd, &namelist, scandir_error_select, NULL);
-	ATF_CHECK_EQ(-1, ret);
-	ATF_CHECK_ERRNO(EBADF, ret < 0);
+	ATF_CHECK_ERRNO(EBADF,
+	    fdscandir(fd, &namelist, scandir_error_select, NULL) < 0);
 	ATF_CHECK_EQ(NULL, namelist);
 
 	/* second pass, select everything */
@@ -180,9 +179,8 @@ ATF_TC_BODY(scandir_error, tc)
 	scandir_error_count = 0;
 	scandir_error_fd = fd;
 	scandir_error_select_return = 1;
-	ret = fdscandir(fd, &namelist, scandir_error_select, NULL);
-	ATF_CHECK_EQ(-1, ret);
-	ATF_CHECK_ERRNO(EBADF, ret < 0);
+	ATF_CHECK_ERRNO(EBADF,
+	    fdscandir(fd, &namelist, scandir_error_select, NULL) < 0);
 	ATF_CHECK_EQ(NULL, namelist);
 }
 
diff --git a/lib/libc/tests/gen/wordexp_test.c b/lib/libc/tests/gen/wordexp_test.c
index 909097fbf51e..a8b9d5509633 100644
--- a/lib/libc/tests/gen/wordexp_test.c
+++ b/lib/libc/tests/gen/wordexp_test.c
@@ -292,6 +292,31 @@ ATF_TC_BODY(with_SIGCHILD_handler_test, tc)
 	ATF_REQUIRE(r == 0);
 }
 
+ATF_TC_WITHOUT_HEAD(with_SIGCHILD_ignore_test);
+ATF_TC_BODY(with_SIGCHILD_ignore_test, tc)
+{
+	struct sigaction sa;
+	wordexp_t we;
+	int r;
+
+	/* With SIGCHLD set to ignore so that the kernel auto-reaps zombies. */
+	sa.sa_flags = 0;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = SIG_IGN;
+	r = sigaction(SIGCHLD, &sa, NULL);
+	ATF_REQUIRE(r == 0);
+	r = wordexp("hello world", &we, 0);
+	ATF_REQUIRE(r == 0);
+	ATF_REQUIRE(we.we_wordc == 2);
+	ATF_REQUIRE(strcmp(we.we_wordv[0], "hello") == 0);
+	ATF_REQUIRE(strcmp(we.we_wordv[1], "world") == 0);
+	ATF_REQUIRE(we.we_wordv[2] == NULL);
+	wordfree(&we);
+	sa.sa_handler = SIG_DFL;
+	r = sigaction(SIGCHLD, &sa, NULL);
+	ATF_REQUIRE(r == 0);
+}
+
 ATF_TC_WITHOUT_HEAD(with_unused_non_default_IFS_test);
 ATF_TC_BODY(with_unused_non_default_IFS_test, tc)
 {
@@ -350,6 +375,7 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, WRDE_BADCHAR_test);
 	ATF_TP_ADD_TC(tp, WRDE_SYNTAX_test);
 	ATF_TP_ADD_TC(tp, with_SIGCHILD_handler_test);
+	ATF_TP_ADD_TC(tp, with_SIGCHILD_ignore_test);
 	ATF_TP_ADD_TC(tp, with_unused_non_default_IFS_test);
 	ATF_TP_ADD_TC(tp, with_used_non_default_IFS_test);