diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:32 -0800 |
| commit | 25d90d1cb72ce51407324259516843406142fe89 (patch) | |
| tree | 459b0885da10de9eddeed12f49cc9ebd10f0fac8 /compat/mingw.c | |
| parent | d95f610c64b9b33957beaa1da60a489d0b4aa7fc (diff) | |
| parent | 1cadad6f658bfb3ab54b25dd04bac372253473b6 (diff) | |
| download | git-25d90d1cb72ce51407324259516843406142fe89.tar.gz | |
Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'
Cygwin update.
* tb/use-common-win32-pathfuncs-on-cygwin:
git clone <url> C:\cygwin\home\USER\repo' is working (again)
Diffstat (limited to 'compat/mingw.c')
| -rw-r--r-- | compat/mingw.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 34b3880b29..b459e1a291 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -350,7 +350,7 @@ static inline int needs_hiding(const char *path) return 0; /* We cannot use basename(), as it would remove trailing slashes */ - mingw_skip_dos_drive_prefix((char **)&path); + win32_skip_dos_drive_prefix((char **)&path); if (!*path) return 0; @@ -2275,33 +2275,6 @@ pid_t waitpid(pid_t pid, int *status, int options) return -1; } -int mingw_skip_dos_drive_prefix(char **path) -{ - int ret = has_dos_drive_prefix(*path); - *path += ret; - return ret; -} - -int mingw_offset_1st_component(const char *path) -{ - char *pos = (char *)path; - - /* unc paths */ - if (!skip_dos_drive_prefix(&pos) && - is_dir_sep(pos[0]) && is_dir_sep(pos[1])) { - /* skip server name */ - pos = strpbrk(pos + 2, "\\/"); - if (!pos) - return 0; /* Error: malformed unc path */ - - do { - pos++; - } while (*pos && !is_dir_sep(*pos)); - } - - return pos + is_dir_sep(*pos) - path; -} - int xutftowcsn(wchar_t *wcs, const char *utfs, size_t wcslen, int utflen) { int upos = 0, wpos = 0; |