diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2017-05-29 22:27:35 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-02 10:40:04 +0900 |
| commit | e5b313442ab7c700d0851e9dbe7d2b029e3893e5 (patch) | |
| tree | 33b59e0d9f56bd9b405bcb8a19d84e9c81b1ed03 | |
| parent | mingw: verify that paths are not mistaken for remote nicknames (diff) | |
| download | tgif-e5b313442ab7c700d0851e9dbe7d2b029e3893e5.tar.xz | |
mingw_fopen: report ENOENT for invalid file names
On Windows, certain characters are prohibited in file names, most
prominently the colon. When fopen() is called with such an invalid file
name, the underlying Windows API actually reports a particular error,
but since there is no suitable errno value, this error is translated
to EINVAL. Detect the case and report ENOENT instead.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.c | 2 | ||||
| -rwxr-xr-x | t/t5580-clone-push-unc.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 3fbfda5978..b604a827e8 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -423,6 +423,8 @@ FILE *mingw_fopen (const char *filename, const char *otype) return NULL; } file = _wfopen(wfilename, wotype); + if (!file && GetLastError() == ERROR_INVALID_NAME) + errno = ENOENT; if (file && hide && set_hidden_flag(wfilename, 1)) warning("could not mark '%s' as hidden.", filename); return file; diff --git a/t/t5580-clone-push-unc.sh b/t/t5580-clone-push-unc.sh index 944730cddc..b322c2f722 100755 --- a/t/t5580-clone-push-unc.sh +++ b/t/t5580-clone-push-unc.sh @@ -45,7 +45,7 @@ test_expect_success push ' test "$rev" = "$(git rev-parse --verify refs/heads/to-push)" ' -test_expect_failure 'remote nick cannot contain backslashes' ' +test_expect_success 'remote nick cannot contain backslashes' ' BACKSLASHED="$(pwd | tr / \\\\)" && git ls-remote "$BACKSLASHED" >out 2>err && test_i18ngrep ! "unable to access" err |