kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff-no-index: do not reference .d_type member of struct dirent 

Some platforms like AIX lack .d_type member in "struct dirent"; use
the DTYPE(e) macro instead of a direct reference to e->d_type and
when it yields DT_UNKNOWN, find the real type with get_dtype().

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2025-06-18 13:04:12 -07:00
parent 09fb155f11
commit d094e05ea5
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
diff-no-index.c
View File

@ -41,12 +41,24 @@ static int read_directory_contents(const char *path, struct string_list *list,


while ((e = readdir_skip_dot_and_dotdot(dir))) { while ((e = readdir_skip_dot_and_dotdot(dir))) {
if (pathspec) { if (pathspec) {
int is_dir = 0;

strbuf_setlen(&match, len); strbuf_setlen(&match, len);
strbuf_addstr(&match, e->d_name); strbuf_addstr(&match, e->d_name);
if (NOT_CONSTANT(DTYPE(e)) != DT_UNKNOWN) {
is_dir = (DTYPE(e) == DT_DIR);
} else {
struct strbuf pathbuf = STRBUF_INIT;

strbuf_addstr(&pathbuf, path);
strbuf_complete(&pathbuf, '/');
is_dir = get_dtype(e, &pathbuf, 0) == DT_DIR;
strbuf_release(&pathbuf);
}


if (!match_leading_pathspec(NULL, pathspec, if (!match_leading_pathspec(NULL, pathspec,
match.buf, match.len, match.buf, match.len,
0, NULL, e->d_type == DT_DIR ? 1 : 0)) 0, NULL, is_dir))
continue; continue;
} }