From nobody Fri Jun 5 15:09:48 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gX4bw6hQyz6g0Q5 for ; Fri, 05 Jun 2026 15:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gX4bw5L7Vz3nsy for ; Fri, 05 Jun 2026 15:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780672188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RXtfMolbho2Q1iWHyZF4NMwl9RU8kW0zarwvTbMnys8=; b=t+yUWN9+yw5atB/1GAM4pwBl3+fMjRdjAvtWmcen5kC0vcVCf/t9i0qbgTmxG5X2h0N93L LKfGgRYRTsxAsaEDDJnny7pwkLlRRINXE9658jcY4U2wrc5vZvvaj6nP6Bs9ddPAduMeLJ s6AMchJ2VKry/mBCSDRNXTL3RLiZhQ0YS/Q5Gya4xu2esgUwpSBYVsUSuMXNIKpjGbQVkj CTspuxDez0UV6wz9Pb0fMKQbtZDZuBjfSlvHy3LrCBuxabOvVn6xbzAZ85D2IBOe2cY2gy LW/Yl7XCYrLkSdzsHVBFMaN5/c34RqtSK4EONDRZ6R9Gk1O8ytiEKd4KUZ7oCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780672188; a=rsa-sha256; cv=none; b=Q68Rzuhoik5ltVqKKdKMar9YNioN+3BOngl16DTjrRox0kpud0BBg1vgp8Mhya39V1c9tg tFELPAXMuEKLmjHBpTUVw1eafVtggiM8PJ5Puew1Oq+BW34pXG7iSkUq67gRC0W5cIu1c2 8ajYKRx6tN4JrmxNoqe8Hw/o/vJiCkiqsoB37NYi4+yElI9RtMDGVkwNbcVJwmdcOgZDhz haw6ihQy2GPSY4ZF6DvciEd1ObDbuBq6ltqLZdTUW2pTS1y4ZpyUaR8vNdW6lpii1MzlBk 8tH+NFBH3V5RIm7fMnRKpDbqsAMJXPsNGmtEiTHa54ZD5FpwnXDrYg8EYyTshg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780672188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RXtfMolbho2Q1iWHyZF4NMwl9RU8kW0zarwvTbMnys8=; b=CCJm7IvLE9w/mmWc7IdSYh6Wblze7ritXIbhotd8S4Yy7efvGFwdS+Ftn8drju2d1LCkld U6uV4sqhrysn+ZFgabswGWfuQCdf++HbflLUN1AccHHAFB4q+zChHztJDyZp/mCuC9wzIR jB9eimm6lA9iH2nhj2Z0hoxdRYd7GNETFCii2r0IrcLl8J8i/yupCuShxqdWJmuJ87bMSV IAmfrVC0/GsmWMSLlCBWo57xT/vrkRTt7NN/Nzjc/k2BwPgZJXlSPUrp4JGgj29Kj8Czh/ vpRJgFQ/npY8ZZVvx//6MZkCM5E9SVDm5amF94sCyAoJiG8C1AtFaYlOxvCAkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gX4bw42JyzZwQ for ; Fri, 05 Jun 2026 15:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f7d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Jun 2026 15:09:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jitendra Bhati From: Alan Somers Subject: git: ee213339f4b2 - main - fts: address post-merge feedback on fts_set_test.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee213339f4b21782cd1b44086ff9b7fe1fd682c5 Auto-Submitted: auto-generated Date: Fri, 05 Jun 2026 15:09:48 +0000 Message-Id: <6a22e6bc.3f7d6.1c1163d8@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ee213339f4b21782cd1b44086ff9b7fe1fd682c5 commit ee213339f4b21782cd1b44086ff9b7fe1fd682c5 Author: Jitendra Bhati AuthorDate: 2026-06-03 22:39:45 +0000 Commit: Alan Somers CommitDate: 2026-06-05 15:06:33 +0000 fts: address post-merge feedback on fts_set_test.c Per review by des@: - Remove fts_check_debug() which has no effect in fts_set_test.c, and remove unused #include "fts_test.h" - Add errno = 0 before fts_read() so errno check is meaningful - Remove fts_lexical_compar where traversal order does not matter - Change int boolean flags to bool throughout - Use !saw_inside instead of saw_inside == false - Move fts_set_clientptr/fts_get_clientptr test inside fts_read() loop so the pointer is exercised during active traversal Fixes: 940142d6103 ("lib/libc/tests/gen: add fts_set() tests") Sponsored by: Google LLC (GSoC 2026) Reviewed by: des, asomers MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/2258 --- lib/libc/tests/gen/fts_set_test.c | 61 ++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/lib/libc/tests/gen/fts_set_test.c b/lib/libc/tests/gen/fts_set_test.c index 340af648c472..26cca82101a6 100644 --- a/lib/libc/tests/gen/fts_set_test.c +++ b/lib/libc/tests/gen/fts_set_test.c @@ -22,8 +22,6 @@ #include -#include "fts_test.h" - /* * fts_set with invalid options must return non-zero with EINVAL. * Note: fts_set returns 1 (not -1) on error. @@ -68,11 +66,10 @@ ATF_TC_BODY(again, tc) ATF_REQUIRE_EQ(0, mkdir("dir", 0755)); ATF_REQUIRE_EQ(0, close(creat("dir/file", 0644))); - ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, - fts_lexical_compar)) != NULL); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); revisit_count = 0; - while ((ent = fts_read(fts)) != NULL) { + for (errno = 0; (ent = fts_read(fts)) != NULL; errno = 0) { if (ent->fts_info == FTS_F && revisit_count == 0) { ATF_REQUIRE_EQ_MSG(0, fts_set(fts, ent, FTS_AGAIN), @@ -142,25 +139,24 @@ ATF_TC_BODY(follow_symlink_to_file, tc) char *paths[] = { "dir", NULL }; FTS *fts; FTSENT *ent; - int followed; + bool followed; ATF_REQUIRE_EQ(0, mkdir("dir", 0755)); ATF_REQUIRE_EQ(0, close(creat("dir/target", 0644))); ATF_REQUIRE_EQ(0, symlink("target", "dir/link")); - ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, - fts_lexical_compar)) != NULL); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); - followed = 0; + followed = false; while ((ent = fts_read(fts)) != NULL) { if (ent->fts_info == FTS_SL && strcmp(ent->fts_name, "link") == 0) ATF_REQUIRE_EQ(0, fts_set(fts, ent, FTS_FOLLOW)); else if (ent->fts_info == FTS_F && strcmp(ent->fts_name, "link") == 0) - followed = 1; + followed = true; } - ATF_CHECK_MSG(followed != 0, + ATF_CHECK_MSG(followed, "FTS_FOLLOW on symlink-to-file must yield FTS_F"); ATF_REQUIRE_EQ_MSG(0, fts_close(fts), "fts_close(): %m"); @@ -181,17 +177,16 @@ ATF_TC_BODY(follow_symlink_to_dir, tc) char *paths[] = { "dir", NULL }; FTS *fts; FTSENT *ent; - int saw_inside; + bool saw_inside; ATF_REQUIRE_EQ(0, mkdir("dir", 0755)); ATF_REQUIRE_EQ(0, mkdir("dir/real", 0755)); ATF_REQUIRE_EQ(0, close(creat("dir/real/inside", 0644))); ATF_REQUIRE_EQ(0, symlink("real", "dir/link")); - ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, - fts_lexical_compar)) != NULL); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); - saw_inside = 0; + saw_inside = false; while ((ent = fts_read(fts)) != NULL) { if (ent->fts_info == FTS_SL && strcmp(ent->fts_name, "link") == 0) @@ -199,9 +194,9 @@ ATF_TC_BODY(follow_symlink_to_dir, tc) if (ent->fts_info == FTS_F && strcmp(ent->fts_name, "inside") == 0 && strcmp(ent->fts_path, "dir/link/inside") == 0) - saw_inside = 1; + saw_inside = true; } - ATF_CHECK_MSG(saw_inside != 0, + ATF_CHECK_MSG(saw_inside, "FTS_FOLLOW on symlink-to-dir should descend and visit 'inside'"); ATF_REQUIRE_EQ_MSG(0, fts_close(fts), "fts_close(): %m"); @@ -259,25 +254,24 @@ ATF_TC_BODY(skip, tc) char *paths[] = { "dir", NULL }; FTS *fts; FTSENT *ent; - int saw_inside; + bool saw_inside; ATF_REQUIRE_EQ(0, mkdir("dir", 0755)); ATF_REQUIRE_EQ(0, mkdir("dir/skip_me", 0755)); ATF_REQUIRE_EQ(0, close(creat("dir/skip_me/inside", 0644))); ATF_REQUIRE_EQ(0, close(creat("dir/sibling", 0644))); - ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, - fts_lexical_compar)) != NULL); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); - saw_inside = 0; + saw_inside = false; while ((ent = fts_read(fts)) != NULL) { if (ent->fts_info == FTS_D && strcmp(ent->fts_name, "skip_me") == 0) ATF_REQUIRE_EQ(0, fts_set(fts, ent, FTS_SKIP)); if (strcmp(ent->fts_name, "inside") == 0) - saw_inside = 1; + saw_inside = true; } - ATF_CHECK_MSG(saw_inside == 0, + ATF_CHECK_MSG(!saw_inside, "FTS_SKIP: 'inside' must not have been visited"); ATF_REQUIRE_EQ_MSG(0, fts_close(fts), "fts_close(): %m"); @@ -295,18 +289,32 @@ ATF_TC_HEAD(clientptr_roundtrip, tc) } ATF_TC_BODY(clientptr_roundtrip, tc) { - char *paths[] = { ".", NULL }; + char *paths[] = { "dir", NULL }; FTS *fts; + FTSENT *ent; int value = 42; + ATF_REQUIRE_EQ(0, mkdir("dir", 0755)); + ATF_REQUIRE_EQ(0, close(creat("dir/file", 0644))); + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); + /* Initially NULL. */ ATF_CHECK_EQ(NULL, fts_get_clientptr(fts)); fts_set_clientptr(fts, &value); - ATF_CHECK_EQ_MSG(&value, fts_get_clientptr(fts), - "fts_get_clientptr did not return the stored pointer"); + while ((ent = fts_read(fts)) != NULL) { + /* + * Verify the pointer is accessible and correct + * while traversal is active. + */ + ATF_CHECK_EQ_MSG(&value, fts_get_clientptr(fts), + "fts_get_clientptr did not return the stored pointer " + "for entry '%s'", ent->fts_name); + } + + /* Overwrite with NULL, verify. */ fts_set_clientptr(fts, NULL); ATF_CHECK_EQ(NULL, fts_get_clientptr(fts)); @@ -346,7 +354,6 @@ ATF_TC_BODY(get_stream_backpointer, tc) ATF_TP_ADD_TCS(tp) { - fts_check_debug(); ATF_TP_ADD_TC(tp, invalid_options); ATF_TP_ADD_TC(tp, again); ATF_TP_ADD_TC(tp, again_consecutive);