[PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.

diff --git a/checkout-cache.c b/checkout-cache.c
index a1ef9448c35fa76ea036faae1a789f0cb654198d..18729374fc5da8a6c7b568fe571bac58e705545d 100644 (file)
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -32,6 +32,8 @@
  * of "-a" causing problems (not possible in the above example,
  * but get used to it in scripting!).
  */
+#include <sys/types.h>
+#include <dirent.h>
 #include "cache.h"
 
 static int force = 0, quiet = 0, not_new = 0;
@@ -46,8 +48,49 @@ static void create_directories(const char *path)
                len = slash - path;
                memcpy(buf, path, len);
                buf[len] = 0;
-               mkdir(buf, 0755);
+               if (mkdir(buf, 0755)) {
+                       if (errno == EEXIST) {
+                               struct stat st;
+                               if (!lstat(buf, &st) && S_ISDIR(st.st_mode))
+                                       continue; /* ok */
+                               if (force && !unlink(buf) && !mkdir(buf, 0755))
+                                       continue;
+                       }
+                       die("cannot create directory at %s", buf);
+               }
+       }
+       free(buf);
+}
+
+static void remove_subtree(const char *path)
+{
+       DIR *dir = opendir(path);
+       struct dirent *de;
+       char pathbuf[PATH_MAX];
+       char *name;
+       
+       if (!dir)
+               die("cannot opendir %s", path);
+       strcpy(pathbuf, path);
+       name = pathbuf + strlen(path);
+       *name++ = '/';
+       while ((de = readdir(dir)) != NULL) {
+               struct stat st;
+               if ((de->d_name[0] == '.') &&
+                   ((de->d_name[1] == 0) ||
+                    ((de->d_name[1] == '.') && de->d_name[2] == 0)))
+                       continue;
+               strcpy(name, de->d_name);
+               if (lstat(pathbuf, &st))
+                       die("cannot lstat %s", pathbuf);
+               if (S_ISDIR(st.st_mode))
+                       remove_subtree(pathbuf);
+               else if (unlink(pathbuf))
+                       die("cannot unlink %s", pathbuf);
        }
+       closedir(dir);
+       if (rmdir(path))
+               die("cannot rmdir %s", path);
 }
 
 static int create_file(const char *path, unsigned int mode)
@@ -55,10 +98,11 @@ static int create_file(const char *path, unsigned int mode)
        int fd;
 
        mode = (mode & 0100) ? 0777 : 0666;
+       create_directories(path);
        fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
        if (fd < 0) {
-               if (errno == ENOENT) {
-                       create_directories(path);
+               if (errno == EISDIR && force) {
+                       remove_subtree(path);
                        fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
                }
        }
@@ -72,23 +116,44 @@ static int write_entry(struct cache_entry *ce, const char *path)
        unsigned long size;
        long wrote;
        char type[20];
+       char target[1024];
 
        new = read_sha1_file(ce->sha1, type, &size);
        if (!new || strcmp(type, "blob")) {
+               if (new)
+                       free(new);
                return error("checkout-cache: unable to read sha1 file of %s (%s)",
                        path, sha1_to_hex(ce->sha1));
        }
-       fd = create_file(path, ntohl(ce->ce_mode));
-       if (fd < 0) {
+       switch (ntohl(ce->ce_mode) & S_IFMT) {
+       case S_IFREG:
+               fd = create_file(path, ntohl(ce->ce_mode));
+               if (fd < 0) {
+                       free(new);
+                       return error("checkout-cache: unable to create file %s (%s)",
+                               path, strerror(errno));
+               }
+               wrote = write(fd, new, size);
+               close(fd);
+               free(new);
+               if (wrote != size)
+                       return error("checkout-cache: unable to write file %s", path);
+               break;
+       case S_IFLNK:
+               memcpy(target, new, size);
+               target[size] = '\0';
+               create_directories(path);
+               if (symlink(target, path)) {
+                       free(new);
+                       return error("checkout-cache: unable to create symlink %s (%s)",
+                               path, strerror(errno));
+               }
+               free(new);
+               break;
+       default:
                free(new);
-               return error("checkout-cache: unable to create %s (%s)",
-                       path, strerror(errno));
+               return error("checkout-cache: unknown file mode for %s", path);
        }
-       wrote = write(fd, new, size);
-       close(fd);
-       free(new);
-       if (wrote != size)
-               return error("checkout-cache: unable to write %s", path);
        return 0;
 }
 
@@ -101,7 +166,7 @@ static int checkout_entry(struct cache_entry *ce, const char *base_dir)
        memcpy(path, base_dir, len);
        strcpy(path + len, ce->name);
 
-       if (!stat(path, &st)) {
+       if (!lstat(path, &st)) {
                unsigned changed = cache_match_stat(ce, &st);
                if (!changed)
                        return 0;