Fixed misnamed t/t2010-update-cache-badpath.sh
[git.git] / checkout-cache.c
index 1c25766..1872937 100644 (file)
  * 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;
+static int force = 0, quiet = 0, not_new = 0;
 
 static void create_directories(const char *path)
 {
        int len = strlen(path);
-       char *buf = malloc(len + 1);
+       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;
-               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,54 +98,81 @@ 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);
                }
        }
        return fd;
 }
 
-static int write_entry(struct cache_entry *ce)
+static int write_entry(struct cache_entry *ce, const char *path)
 {
        int fd;
        void *new;
        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)",
-                       ce->name, sha1_to_hex(ce->sha1));
+                       path, sha1_to_hex(ce->sha1));
        }
-       fd = create_file(ce->name, 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);
-               return error("checkout-cache: unable to create %s (%s)",
-                       ce->name, strerror(errno));
+               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: 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", ce->name);
        return 0;
 }
 
-static int checkout_entry(struct cache_entry *ce)
+static int checkout_entry(struct cache_entry *ce, const char *base_dir)
 {
        struct stat st;
+       static char path[MAXPATHLEN+1];
+       int len = strlen(base_dir);
 
-       if (!stat(ce->name, &st)) {
+       memcpy(path, base_dir, len);
+       strcpy(path + len, ce->name);
+
+       if (!lstat(path, &st)) {
                unsigned changed = cache_match_stat(ce, &st);
                if (!changed)
                        return 0;
                if (!force) {
                        if (!quiet)
-                               fprintf(stderr, "checkout-cache: %s already exists\n", ce->name);
+                               fprintf(stderr, "checkout-cache: %s already exists\n", path);
                        return 0;
                }
 
@@ -112,12 +182,13 @@ static int checkout_entry(struct cache_entry *ce)
                 * to emulate by hand - much easier to let the system
                 * just do the right thing)
                 */
-               unlink(ce->name);
-       }
-       return write_entry(ce);
+               unlink(path);
+       } else if (not_new) 
+               return 0;
+       return write_entry(ce, path);
 }
 
-static int checkout_file(const char *name)
+static int checkout_file(const char *name, const char *base_dir)
 {
        int pos = cache_name_pos(name, strlen(name));
        if (pos < 0) {
@@ -132,16 +203,18 @@ static int checkout_file(const char *name)
                }
                return -1;
        }
-       return checkout_entry(active_cache[pos]);
+       return checkout_entry(active_cache[pos], base_dir);
 }
 
-static int checkout_all(void)
+static int checkout_all(const char *base_dir)
 {
        int i;
 
        for (i = 0; i < active_nr ; i++) {
                struct cache_entry *ce = active_cache[i];
-               if (checkout_entry(ce) < 0)
+               if (ce_stage(ce))
+                       continue;
+               if (checkout_entry(ce, base_dir) < 0)
                        return -1;
        }
        return 0;
@@ -150,6 +223,7 @@ static int checkout_all(void)
 int main(int argc, char **argv)
 {
        int i, force_filename = 0;
+       const char *base_dir = "";
 
        if (read_cache() < 0) {
                die("invalid cache");
@@ -159,7 +233,7 @@ int main(int argc, char **argv)
                const char *arg = argv[i];
                if (!force_filename) {
                        if (!strcmp(arg, "-a")) {
-                               checkout_all();
+                               checkout_all(base_dir);
                                continue;
                        }
                        if (!strcmp(arg, "--")) {
@@ -174,8 +248,16 @@ int main(int argc, char **argv)
                                quiet = 1;
                                continue;
                        }
+                       if (!strcmp(arg, "-n")) {
+                               not_new = 1;
+                               continue;
+                       }
+                       if (!memcmp(arg, "--prefix=", 9)) {
+                               base_dir = arg+9;
+                               continue;
+                       }
                }
-               checkout_file(arg);
+               checkout_file(arg, base_dir);
        }
        return 0;
 }