threads / patch / 58980

patchExplicitly set errno to ENOENT if err is not ERROR_DIRECTORY

Subject: [PATCH] Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY

## tl;dr

4 messages between Dec 19, 2022 and Dec 20, 2022. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Rose via GitGitGadget· Dec 19, 2022, 15:51 UTC · lore
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(-)
Show changes to compat/win32/dirent.c +2 −2
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· Dec 19, 2022, 16:20 UTC · re: Rose via GitGitGadget · lore

[PATCH v2] win32: explicitly set errno to enoent if err is not error_directory

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>
---
    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 <doremylover123@gmail.com>
      
       ## 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(-)
Show changes to compat/win32/dirent.c +2 −2
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
Johannes Sixt· Dec 20, 2022, 07:21 UTC · re: Rose via GitGitGadget · lore

Re: [PATCH v2] win32: explicitly set errno to enoent if err is not error_directory

Am 19.12.22 um 17:20 schrieb Rose via GitGitGadget:
Show 10 quoted lines
> 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>
> ---
Show 17 quoted lines
> 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
Ævar Arnfjörð Bjarmason· Dec 19, 2022, 18:33 UTC · re: Rose via GitGitGadget · lore

Re: [PATCH] Explicitly set errno to ENOENT if err is not ERROR_DIRECTORY

On Mon, Dec 19 2022, Rose via GitGitGadget wrote:
Show 36 quoted lines
> 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...

← back to recent threads