From: Collin Funk <collin.funk1@gmail.com>
To: git@vger.kernel.org
Cc: shejialuo@gmail.com, Collin Funk <collin.funk1@gmail.com>,
Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] wrapper: Fix a errno discrepancy on NetBSD.
Date: Fri, 2 May 2025 16:33:32 -0700 [thread overview]
Message-ID: <20250502233403.289761-1-collin.funk1@gmail.com> (raw)
As documented on NetBSD's man page, open with the O_NOFOLLOW flag and a
symlink returns -1 and sets errno to EFTYPE which differs from POSIX.
This patch fixes the following test failure:
$ sh t0602-reffiles-fsck.sh --verbose
--- expect 2025-05-02 23:05:23.920890147 +0000
+++ err 2025-05-02 23:05:23.916794959 +0000
@@ -1 +1 @@
-error: packed-refs: badRefFiletype: not a regular file but a symlink
+error: unable to open '.git/packed-refs': Inappropriate file type or format
not ok 12 - the filetype of packed-refs should be checked
This portability issue was introduced in Commit
cfea2f2da8 (packed-backend: check whether the "packed-refs" is regular file, 2025-02-28)
Signed-off-by: Collin Funk <collin.funk1@gmail.com>
---
wrapper.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/wrapper.c b/wrapper.c
index 3c79778055..4d448d7c57 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -737,7 +737,19 @@ int is_empty_or_missing_file(const char *filename)
int open_nofollow(const char *path, int flags)
{
#ifdef O_NOFOLLOW
- return open(path, flags | O_NOFOLLOW);
+ int ret = open(path, flags | O_NOFOLLOW);
+#ifdef __NetBSD__
+ /*
+ * NetBSD sets errno to EFTYPE when path is a symlink. The only other
+ * time this errno occurs when O_REGULAR is used. Since we don't use
+ * it anywhere we can avoid an lstat here.
+ */
+ if (ret < 0 && errno == EFTYPE) {
+ errno = ELOOP;
+ return -1;
+ }
+#endif
+ return ret;
#else
struct stat st;
if (lstat(path, &st) < 0)
--
2.49.0
next reply other threads:[~2025-05-02 23:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-02 23:33 Collin Funk [this message]
2025-05-03 0:57 ` [PATCH] wrapper: Fix a errno discrepancy on NetBSD brian m. carlson
2025-05-03 1:05 ` Junio C Hamano
2025-05-03 4:21 ` Collin Funk
2025-05-03 17:32 ` Junio C Hamano
2025-05-03 3:48 ` Collin Funk
2025-05-03 13:31 ` Jeff King
2025-05-03 14:58 ` shejialuo
2025-05-03 15:49 ` Jeff King
2025-05-05 6:39 ` Patrick Steinhardt
2025-05-05 12:17 ` shejialuo
2025-05-03 18:56 ` Collin Funk
2025-05-05 15:43 ` Junio C Hamano
2025-05-05 18:03 ` Jeff King
2025-05-06 13:43 ` shejialuo
2025-05-06 22:58 ` Junio C Hamano
2025-05-03 4:16 ` [PATCH v2] wrapper: NetBSD gives EFTYPE and FreeBSD gives EMFILE where POSIX uses ELOOP Collin Funk
2025-05-03 15:45 ` brian m. carlson
2025-05-03 18:44 ` Collin Funk
2025-05-05 6:43 ` Patrick Steinhardt
2025-05-05 20:41 ` Junio C Hamano
2025-05-06 1:16 ` Collin Funk
2025-05-06 13:23 ` Patrick Steinhardt
2025-05-06 1:08 ` [PATCH v3] " Collin Funk
2025-05-06 13:24 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250502233403.289761-1-collin.funk1@gmail.com \
--to=collin.funk1@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=shejialuo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).