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

Use sha1_file.c's mkdir-like routine in apply.c.

Browse Source 
As far as I can see, create_subdirectories() in apply.c just
duplicates the functionality of safe_create_leading_directories() from
sha1_file.c.  The former has a warm, fuzzy const parameter, but that's
not important.

The potential problem with EEXIST and creating directories should
never occur here, but will be removed by future
safe_create_leading_directories() changes.  Other uses of EEXIST in
apply.c should be fine barring intentionally malicious behavior.

Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jason Riedy 2006-02-03 22:50:57 -08:00 committed by Junio C Hamano
parent 1fda3d557b
commit 8361e1d4d3
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apply.c
View File

@ -1564,24 +1564,6 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
die("unable to add cache entry for %s", path); die("unable to add cache entry for %s", path);
} }
static void create_subdirectories(const char *path)
{
int len = strlen(path);
char *buf = xmalloc(len + 1);
const char *slash = path;
while ((slash = strchr(slash+1, '/')) != NULL) {
len = slash - path;
memcpy(buf, path, len);
buf[len] = 0;
if (mkdir(buf, 0777) < 0) {
if (errno != EEXIST)
break;
}
}
free(buf);
}
static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size) static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
{ {
int fd; int fd;
@ -1610,13 +1592,14 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,
* which is true 99% of the time anyway. If they don't, * which is true 99% of the time anyway. If they don't,
* we create them and try again. * we create them and try again.
*/ */
static void create_one_file(const char *path, unsigned mode, const char *buf, unsigned long size) static void create_one_file(char *path, unsigned mode, const char *buf, unsigned long size)
{ {
if (!try_create_file(path, mode, buf, size)) if (!try_create_file(path, mode, buf, size))
return; return;
if (errno == ENOENT) { if (errno == ENOENT) {
create_subdirectories(path); if (safe_create_leading_directories(path))
return;
if (!try_create_file(path, mode, buf, size)) if (!try_create_file(path, mode, buf, size))
return; return;
} }
@ -1643,7 +1626,7 @@ static void create_one_file(const char *path, unsigned mode, const char *buf, un
static void create_file(struct patch *patch) static void create_file(struct patch *patch)
{ {
const char *path = patch->new_name; char *path = patch->new_name;
unsigned mode = patch->new_mode; unsigned mode = patch->new_mode;
unsigned long size = patch->resultsize; unsigned long size = patch->resultsize;
char *buf = patch->result; char *buf = patch->result;