[PATCH] Do _not_ call unlink on a directory

From

TGThomas Glanzmann <sithglan@stud.uni-erlangen.de>

Date

Jul 16, 2007, 17:38 UTC

Message-ID

<11846075213759-git-send-email-sithglan@stud.uni-erlangen.de>

In-Reply-To

<11846059721204-git-send-email-sithglan@stud.uni-erlangen.de>

Signed-off-by: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
---
 entry.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/entry.c b/entry.c
index 82bf725..907293f 100644
--- a/entry.c
+++ b/entry.c
@@ -6,18 +6,18 @@ static void create_directories(const char *path, const struct checkout *state)
 	int len = strlen(path);
 	char *buf = xmalloc(len + 1);
 	const char *slash = path;
+        struct stat st;
 
 	while ((slash = strchr(slash+1, '/')) != NULL) {
 		len = slash - path;
 		memcpy(buf, path, len);
 		buf[len] = 0;
+                if (!stat(buf, &st) && S_ISDIR(st.st_mode))
+                        continue; /* ok */
 		if (mkdir(buf, 0777)) {
 			if (errno == EEXIST) {
-				struct stat st;
 				if (len > state->base_dir_len && state->force && !unlink(buf) && !mkdir(buf, 0777))
 					continue;
-				if (!stat(buf, &st) && S_ISDIR(st.st_mode))
-					continue; /* ok */
 			}
 			die("cannot create directory at %s", buf);
 		}

-- 
1.5.2.1