mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix replacing of a directory with a file/symlink in git-checkout-cache

Browse Source 
The symlink case had never worked, and the file case was broken by the
O_EXCL change because the error return changed from EISDIR to EEXIST.

Fix both problems by just moving the test for an existing directory to a
more logical place.
This commit is contained in:
Linus Torvalds
2005-07-14 09:58:45 -07:00
parent d1918a7285
commit d48a72f337
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
entry.c
View File

@ -57,19 +57,10 @@ static void remove_subtree(const char *path)
die("cannot rmdir %s", path); die("cannot rmdir %s", path);
} }
static int create_file(const char *path, unsigned int mode, int force) static int create_file(const char *path, unsigned int mode)
{ {
int fd;
mode = (mode & 0100) ? 0777 : 0666; mode = (mode & 0100) ? 0777 : 0666;
fd = open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode); return open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode);
if (fd < 0) {
if (errno == EISDIR && force) {
remove_subtree(path);
fd = open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode);
}
}
return fd;
} }
static int write_entry(struct cache_entry *ce, const char *path, struct checkout *state) static int write_entry(struct cache_entry *ce, const char *path, struct checkout *state)
@ -90,7 +81,7 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
} }
switch (ntohl(ce->ce_mode) & S_IFMT) { switch (ntohl(ce->ce_mode) & S_IFMT) {
case S_IFREG: case S_IFREG:
fd = create_file(path, ntohl(ce->ce_mode), state->force); fd = create_file(path, ntohl(ce->ce_mode));
if (fd < 0) { if (fd < 0) {
free(new); free(new);
return error("git-checkout-cache: unable to create file %s (%s)", return error("git-checkout-cache: unable to create file %s (%s)",
@ -151,6 +142,11 @@ int checkout_entry(struct cache_entry *ce, struct checkout *state)
* just do the right thing) * just do the right thing)
*/ */
unlink(path); unlink(path);
if (S_ISDIR(st.st_mode)) {
if (!state->force)
return error("%s is a directory", path);
remove_subtree(path);
}
} else if (state->not_new) } else if (state->not_new)
return 0; return 0;
create_directories(path, state); create_directories(path, state);