# [PATCH] Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY 4 messages from 2022-12-19 to 2022-12-20. Participants: Rose via GitGitGadget, Ævar Arnfjörð Bjarmason, Johannes Sixt. Thread: https://gitlist.dev/t/58980 ## Rose via GitGitGadget, 2022-12-19 15:51 Subject: [PATCH] Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY Message-ID: URL: https://gitlist.dev/e/pull.1402.git.git.1671465108414.gitgitgadget%40gmail.com ``` From: Seija Kijin 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 --- 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'; /* 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; } base-commit: 7c2ef319c52c4997256f5807564523dfd4acdfc7 -- gitgitgadget ``` ## Rose via GitGitGadget, 2022-12-19 16:20 Subject: [PATCH v2] win32: explicitly set errno to enoent if err is not error_directory Message-ID: URL: https://gitlist.dev/e/pull.1402.v2.git.git.1671466826159.gitgitgadget%40gmail.com In-Reply-To: ``` From: Seija Kijin 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 --- win32: 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-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1402/AtariDreams/opendir-v2 Pull-Request: https://github.com/git/git/pull/1402 Range-diff vs v1: 1: 6e66c0deaf9 ! 1: bf757aee0be Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY @@ Metadata Author: Seija Kijin ## Commit message ## - Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY + win32: 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. 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'; /* 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; } base-commit: 7c2ef319c52c4997256f5807564523dfd4acdfc7 -- gitgitgadget ``` ## Ævar Arnfjörð Bjarmason, 2022-12-19 18:33 Subject: Re: [PATCH] Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY Message-ID: <221219.86mt7jxmwd.gmgdl@evledraar.gmail.com> URL: https://gitlist.dev/e/221219.86mt7jxmwd.gmgdl%40evledraar.gmail.com In-Reply-To: ``` On Mon, Dec 19 2022, Rose via GitGitGadget wrote: > From: Seija Kijin > > 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 > --- > 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... ``` ## Johannes Sixt, 2022-12-20 07:21 Subject: Re: [PATCH v2] win32: explicitly set errno to enoent if err is not error_directory Message-ID: <2c0c8ead-3942-6c44-b854-5980cff55755@kdbg.org> URL: https://gitlist.dev/e/2c0c8ead-3942-6c44-b854-5980cff55755%40kdbg.org In-Reply-To: ``` Am 19.12.22 um 17:20 schrieb Rose via GitGitGadget: > From: Seija Kijin > > 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 > --- > 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; This change does not look correct. The documentation of FindFirstFileW()[*] does not give any guarantees that ERROR_DIRECTORY and ERROR_BAD_PATHNAME are the only possible error values. It is certainly not unthinkable that a hardware error is reported as ERROR_IO_DEVICE and should be translated to EIO. [*] https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findfirstfilew -- Hannes ```