summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sha1_file.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 8b0849f931..6e8c05d108 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -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;
}