Merge branch 'ss/safe-create-leading-dir-with-slash'

"git clone $origin foo\bar\baz" on Windows failed to create the
leading directories (i.e. a moral-equivalent of "mkdir -p").

* ss/safe-create-leading-dir-with-slash:
  safe_create_leading_directories(): on Windows, \ can separate path components
This commit is contained in:
Junio C Hamano 2014-01-27 10:45:37 -08:00
Родитель d0956cfa8e 0f5274033e
Коммит 33d4669aaa
1 изменённых файлов: 8 добавлений и 4 удалений

Просмотреть файл

@ -112,17 +112,21 @@ enum scld_error safe_create_leading_directories(char *path)
while (ret == SCLD_OK && next_component) {
struct stat st;
char *slash = strchr(next_component, '/');
char *slash = next_component, slash_character;
if (!slash)
while (*slash && !is_dir_sep(*slash))
slash++;
if (!*slash)
break;
next_component = slash + 1;
while (*next_component == '/')
while (is_dir_sep(*next_component))
next_component++;
if (!*next_component)
break;
slash_character = *slash;
*slash = '\0';
if (!stat(path, &st)) {
/* path exists */
@ -148,7 +152,7 @@ enum scld_error safe_create_leading_directories(char *path)
} else if (adjust_shared_perm(path)) {
ret = SCLD_PERMS;
}
*slash = '/';
*slash = slash_character;
}
return ret;
}