From: "brian m. carlson" <sandals@crustytoothpaste•net>
To: Collin Funk <collin.funk1@gmail•com>
Cc: git@vger•kernel.org, shejialuo@gmail•com,
Jeff King <peff@peff•net>, Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] wrapper: Fix a errno discrepancy on NetBSD.
Date: Sat, 3 May 2025 00:57:11 +0000 [thread overview]
Message-ID: <aBVp51yLwxBpRskt@tapette.crustytoothpaste.net> (raw)
In-Reply-To: <20250502233403.289761-1-collin.funk1@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2154 bytes --]
On 2025-05-02 at 23:33:32, Collin Funk wrote:
> 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;
This patch seems reasonable and correct. I don't use NetBSD, but I do
often test there, and I'm aware of this infelicity. I'm surprised we
haven't hit it before.
I suspect we'll also hit this on FreeBSD, which has a similar issue in
that it returns `EMLINK` instead of `ELOOP`. I do wish these two OSes
would provide an appropriate POSIX-compatible `open` call when set with
`_POSIX_SOURCE`, since this is one of the biggest portability problems
with them.
--
brian m. carlson (they/them)
Toronto, Ontario, CA
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 325 bytes --]
next prev parent reply other threads:[~2025-05-03 0:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-02 23:33 [PATCH] wrapper: Fix a errno discrepancy on NetBSD Collin Funk
2025-05-03 0:57 ` brian m. carlson [this message]
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=aBVp51yLwxBpRskt@tapette.crustytoothpaste.net \
--to=sandals@crustytoothpaste$(echo .)net \
--cc=collin.funk1@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=shejialuo@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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