admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrapper: NetBSD gives EFTYPE and FreeBSD gives EMFILE where POSIX uses ELOOP

Browse Source 
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

FreeBSD has the same issue for EMLINK instead of EFTYPE.

This portability issue was introduced in cfea2f2da8 (packed-backend:
check whether the "packed-refs" is regular file, 2025-02-28)

Signed-off-by: Collin Funk <collin.funk1@gmail.com>
Acked-by: brian m. carlson <sandals@crustytoothpaste.net>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Collin Funk
2025-05-05 18:08:59 -07:00
committed by Junio C Hamano
parent d50a5e8939
commit f47bcc3413
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wrapper.c
View File

@@ -737,7 +737,26 @@ 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);
/*
* 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. FreeBSD does the same with
* EMLINK.
*/
# ifdef __NetBSD__
# define SYMLINK_ERRNO EFTYPE
# elif defined(__FreeBSD__)
# define SYMLINK_ERRNO EMLINK
# endif
# if SYMLINK_ERRNO
if (ret < 0 && errno == SYMLINK_ERRNO) {
errno = ELOOP;
return -1;
}
# undef SYMLINK_ERRNO
# endif
return ret;
#else
struct stat st;
if (lstat(path, &st) < 0)