diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-13 17:03:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-13 17:03:55 -0800 |
| commit | c867e4fa180bec4750e9b54eb10f459030dbebfd (patch) | |
| tree | d178a68edd12cea19afafb57436e3592d6e6178f /dir-iterator.c | |
| parent | 23c56f7bd5f1667f8b793d796bf30e39545920f6 (diff) | |
| parent | cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 (diff) | |
| download | git-c867e4fa180bec4750e9b54eb10f459030dbebfd.tar.gz | |
Sync with Git 2.39.2
Diffstat (limited to 'dir-iterator.c')
| -rw-r--r-- | dir-iterator.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dir-iterator.c b/dir-iterator.c index b17e9f970a..3764dd81a1 100644 --- a/dir-iterator.c +++ b/dir-iterator.c @@ -203,7 +203,7 @@ struct dir_iterator *dir_iterator_begin(const char *path, unsigned int flags) { struct dir_iterator_int *iter = xcalloc(1, sizeof(*iter)); struct dir_iterator *dir_iterator = &iter->base; - int saved_errno; + int saved_errno, err; strbuf_init(&iter->base.path, PATH_MAX); strbuf_addstr(&iter->base.path, path); @@ -213,10 +213,15 @@ struct dir_iterator *dir_iterator_begin(const char *path, unsigned int flags) iter->flags = flags; /* - * Note: stat already checks for NULL or empty strings and - * inexistent paths. + * Note: stat/lstat already checks for NULL or empty strings and + * nonexistent paths. */ - if (stat(iter->base.path.buf, &iter->base.st) < 0) { + if (iter->flags & DIR_ITERATOR_FOLLOW_SYMLINKS) + err = stat(iter->base.path.buf, &iter->base.st); + else + err = lstat(iter->base.path.buf, &iter->base.st); + + if (err < 0) { saved_errno = errno; goto error_out; } |