| Message ID | pull.1402.git.git.1671465108414.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY | expand |
On Mon, Dec 19 2022, Rose via GitGitGadget wrote: > From: Seija Kijin <doremylover123@gmail.com> > > At this point, the only two possible errors are > ERROR_DIRECTORY or ERROR_BAD_PATHNAME. > > This code clarifies this and also saves a call to > err_win_to_posix. > > Signed-off-by: Seija Kijin <doremylover123@gmail.com> > --- > Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY > > At this point, the only two possible errors are ERROR_DIRECTORY or > ERROR_BAD_PATHNAME. > > This code clarifies this and also saves a call to err_win_to_posix. > > Signed-off-by: Seija Kijin doremylover123@gmail.com > > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1402%2FAtariDreams%2Fopendir-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1402/AtariDreams/opendir-v1 > Pull-Request: https://github.com/git/git/pull/1402 > > compat/win32/dirent.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c > index 52420ec7d4d..8f94a5ab6db 100644 > --- a/compat/win32/dirent.c > +++ b/compat/win32/dirent.c > @@ -34,13 +34,13 @@ DIR *opendir(const char *name) > if (len && !is_dir_sep(pattern[len - 1])) > pattern[len++] = '/'; > pattern[len++] = '*'; > - pattern[len] = 0; > + pattern[len] = '\0'; Maybe the subject of this patch is a good change (I have no idea, and don't use Windows), but this just seems like unrelated general cleanup. I think it's probably good to change these sorts cases from 0 to '\0', but let's do that as a seperate change...
diff --git a/compat/win32/dirent.c b/compat/win32/dirent.c index 52420ec7d4d..8f94a5ab6db 100644 --- a/compat/win32/dirent.c +++ b/compat/win32/dirent.c @@ -34,13 +34,13 @@ DIR *opendir(const char *name) if (len && !is_dir_sep(pattern[len - 1])) pattern[len++] = '/'; pattern[len++] = '*'; - pattern[len] = 0; + pattern[len] = '\0'; /* open find handle */ h = FindFirstFileW(pattern, &fdata); if (h == INVALID_HANDLE_VALUE) { DWORD err = GetLastError(); - errno = (err == ERROR_DIRECTORY) ? ENOTDIR : err_win_to_posix(err); + errno = (err == ERROR_DIRECTORY) ? ENOTDIR : ENOENT; return NULL; }