global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-27 10:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'unc-alternates' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2016-11-24 22:10:46 +01:00
parent 954b2ba8ef aa82745b92
commit 60b60cfd75
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compat/mingw.h
View File

@@ -480,6 +480,7 @@ HANDLE winansi_get_osfhandle(int fd);
(isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
int mingw_skip_dos_drive_prefix(char **path);
#define skip_dos_drive_prefix mingw_skip_dos_drive_prefix
#define has_unc_prefix(path) (*(path) == '\\' && (path)[1] == '\\' ? 2 : 0)
#define is_dir_sep(c) ((c) == '/' || (c) == '\\')
static inline char *mingw_find_last_dir_sep(const char *path)
{

8
git-compat-util.h
View File

@@ -392,6 +392,14 @@ static inline int git_skip_dos_drive_prefix(char **path)
#define skip_dos_drive_prefix git_skip_dos_drive_prefix
#endif
#ifndef has_unc_prefix
static inline int git_has_unc_prefix(const char *path)
{
return 0;
}
#define has_unc_prefix git_has_unc_prefix
#endif
#ifndef is_dir_sep
static inline int git_is_dir_sep(int c)
{

4
path.c
View File

@@ -1019,9 +1019,9 @@ const char *remove_leading_path(const char *in, const char *prefix)
int normalize_path_copy_len(char *dst, const char *src, int *prefix_len)
{
char *dst0;
int i;
int i = has_unc_prefix(src);
for (i = has_dos_drive_prefix(src); i > 0; i--)
for (i = i ? i : has_dos_drive_prefix(src); i > 0; i--)
*dst++ = *src++;
dst0 = dst;