Commit 83261a44 by Vicent Martí

Merge pull request #1173 from nulltoken/bug/discover

Teach UNC paths to git_path_dirname_r()
parents 7382551f 50a762a5
......@@ -19,6 +19,22 @@
#define LOOKS_LIKE_DRIVE_PREFIX(S) (git__isalpha((S)[0]) && (S)[1] == ':')
static bool looks_like_network_computer_name(const char *path, int pos)
{
if (pos < 3)
return false;
if (path[0] != '/' || path[1] != '/')
return false;
while (pos-- > 2) {
if (path[pos] == '/')
return false;
}
return true;
}
/*
* Based on the Android implementation, BSD licensed.
* Check http://android.git.kernel.org/
......@@ -111,6 +127,15 @@ int git_path_dirname_r(git_buf *buffer, const char *path)
len = 3;
goto Exit;
}
/* Similarly checks if we're dealing with a network computer name
'//computername/.git' will return '//computername/' */
if (looks_like_network_computer_name(path, len)) {
len++;
goto Exit;
}
#endif
Exit:
......
......@@ -87,6 +87,15 @@ void test_core_path__00_dirname(void)
check_dirname(".git/", ".");
check_dirname(REP16("/abc"), REP15("/abc"));
#ifdef GIT_WIN32
check_dirname("C:/path/", "C:/");
check_dirname("C:/path", "C:/");
check_dirname("//computername/path/", "//computername/");
check_dirname("//computername/path", "//computername/");
check_dirname("//computername/sub/path/", "//computername/sub");
check_dirname("//computername/sub/path", "//computername/sub");
#endif
}
/* get the base name of a path */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment