diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-29 14:16:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-29 14:16:01 -0700 |
| commit | 0c1a8ec8da53c3d5c7ce1fae8599f18bce6a4b2d (patch) | |
| tree | 0a563a660ba00490501c7bf4f3895ffb9d2cd0b2 /compat | |
| parent | 4dda133385cedfe530607b6ac9183eeefd2a7b2a (diff) | |
| parent | 8e9b20804a9900d4560e9ace4bb8c5d048a2097e (diff) | |
| download | git-0c1a8ec8da53c3d5c7ce1fae8599f18bce6a4b2d.tar.gz | |
Merge branch 'js/mingw-tests-2.8' into maint
Code clean-up.
* js/mingw-tests-2.8:
Windows: shorten code by re-using convert_slashes()
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 54c82ecf20..0413d5c3cd 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -763,15 +763,12 @@ struct tm *localtime_r(const time_t *timep, struct tm *result) char *mingw_getcwd(char *pointer, int len) { - int i; wchar_t wpointer[MAX_PATH]; if (!_wgetcwd(wpointer, ARRAY_SIZE(wpointer))) return NULL; if (xwcstoutf(pointer, wpointer, len) < 0) return NULL; - for (i = 0; pointer[i]; i++) - if (pointer[i] == '\\') - pointer[i] = '/'; + convert_slashes(pointer); return pointer; } @@ -2112,9 +2109,7 @@ static void setup_windows_environment() * executable (by not mistaking the dir separators * for escape characters). */ - for (; *tmp; tmp++) - if (*tmp == '\\') - *tmp = '/'; + convert_slashes(tmp); } /* simulate TERM to enable auto-color (see color.c) */ |