undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

safe_create_leading_directories(): always restore slash at end of loop

Browse Source 
Always restore the slash that we scribbled over at the end of the
loop, rather than also fixing it up at each premature exit from the
loop.  This makes it harder to forget to do the cleanup as new paths
are added to the code.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2014-01-06 14:45:24 +01:00 committed by Junio C Hamano
parent bf10cf70ad
commit 9e6f885d14
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sha1_file.c
View File

@ -108,8 +108,9 @@ int mkdir_in_gitdir(const char *path)
int safe_create_leading_directories(char *path) int safe_create_leading_directories(char *path)
{ {
char *next_component = path + offset_1st_component(path); char *next_component = path + offset_1st_component(path);
int ret = 0;
while (next_component) { while (!ret && next_component) {
struct stat st; struct stat st;
char *slash = strchr(next_component, '/'); char *slash = strchr(next_component, '/');
@ -125,25 +126,20 @@ int safe_create_leading_directories(char *path)
*slash = '\0'; *slash = '\0';
if (!stat(path, &st)) { if (!stat(path, &st)) {
/* path exists */ /* path exists */
if (!S_ISDIR(st.st_mode)) { if (!S_ISDIR(st.st_mode))
*slash = '/'; ret = -3;
return -3;
}
} else if (mkdir(path, 0777)) { } else if (mkdir(path, 0777)) {
if (errno == EEXIST && if (errno == EEXIST &&
!stat(path, &st) && S_ISDIR(st.st_mode)) { !stat(path, &st) && S_ISDIR(st.st_mode))
; /* somebody created it since we checked */ ; /* somebody created it since we checked */
} else { else
*slash = '/'; ret = -1;
return -1;
}
} else if (adjust_shared_perm(path)) { } else if (adjust_shared_perm(path)) {
*slash = '/'; ret = -2;
return -2;
} }
*slash = '/'; *slash = '/';
} }
return 0; return ret;
} }
int safe_create_leading_directories_const(const char *path) int safe_create_leading_directories_const(const char *path)