Fix total permission bogosity in "checkout-cache.c".

[git.git] / update-cache.c

diff --git a/update-cache.c b/update-cache.c
index 25db789..7d1d8e5 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -17,12 +17,16 @@ static int allow_add = 0, allow_remove = 0;
 static int index_fd(const char *path, int namelen, struct cache_entry *ce, int fd, struct stat *st)
 {
        z_stream stream;
-       int max_out_bytes = namelen + st->st_size + 200;
+       unsigned long size = st->st_size;
+       int max_out_bytes = namelen + size + 200;
        void *out = malloc(max_out_bytes);
        void *metadata = malloc(namelen + 200);
-       void *in = mmap(NULL, st->st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+       void *in;
        SHA_CTX c;
 
+       in = "";
+       if (size)
+               in = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
        close(fd);
        if (!out || (int)(long)in == -1)
                return -1;
@@ -34,7 +38,7 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
         * ASCII size + nul byte
         */     
        stream.next_in = metadata;
-       stream.avail_in = 1+sprintf(metadata, "blob %lu", (unsigned long) st->st_size);
+       stream.avail_in = 1+sprintf(metadata, "blob %lu", size);
        stream.next_out = out;
        stream.avail_out = max_out_bytes;
        while (deflate(&stream, 0) == Z_OK)
@@ -44,7 +48,7 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
         * File content
         */
        stream.next_in = in;
-       stream.avail_in = st->st_size;
+       stream.avail_in = size;
        while (deflate(&stream, Z_FINISH) == Z_OK)
                /*nothing */;
 
@@ -64,14 +68,17 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
  */
 static void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
 {
-       ce->ctime.sec = st->st_ctime;
-       ce->ctime.nsec = st->st_ctim.tv_nsec;
-       ce->mtime.sec = st->st_mtime;
-       ce->mtime.nsec = st->st_mtim.tv_nsec;
-       ce->st_dev = st->st_dev;
-       ce->st_ino = st->st_ino;
-       ce->st_uid = st->st_uid;
-       ce->st_gid = st->st_gid;
+       ce->ce_ctime.sec = htonl(st->st_ctime);
+       ce->ce_mtime.sec = htonl(st->st_mtime);
+#ifdef NSEC
+       ce->ce_ctime.nsec = htonl(st->st_ctim.tv_nsec);
+       ce->ce_mtime.nsec = htonl(st->st_mtim.tv_nsec);
+#endif
+       ce->ce_dev = htonl(st->st_dev);
+       ce->ce_ino = htonl(st->st_ino);
+       ce->ce_uid = htonl(st->st_uid);
+       ce->ce_gid = htonl(st->st_gid);
+       ce->ce_size = htonl(st->st_size);
 }
 
 static int add_file_to_cache(char *path)
@@ -99,9 +106,8 @@ static int add_file_to_cache(char *path)
        memset(ce, 0, size);
        memcpy(ce->name, path, namelen);
        fill_stat_cache_info(ce, &st);
-       ce->st_mode = st.st_mode;
-       ce->st_size = st.st_size;
-       ce->namelen = namelen;
+       ce->ce_mode = create_ce_mode(st.st_mode);
+       ce->ce_flags = htons(namelen);
 
        if (index_fd(path, namelen, ce, fd, &st) < 0)
                return -1;
@@ -182,7 +188,6 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
        updated = malloc(size);
        memcpy(updated, ce, size);
        fill_stat_cache_info(updated, &st);
-       updated->st_size = st.st_size;
        return updated;
 }
 
@@ -209,7 +214,7 @@ static void refresh_cache(void)
  * are hidden, for chist sake.
  *
  * Also, we don't want double slashes or slashes at the
- * end that can make pathnames ambiguous. 
+ * end that can make pathnames ambiguous.
  */
 static int verify_path(char *path)
 {
@@ -230,6 +235,35 @@ inside:
        }
 }
 
+static int add_cacheinfo(char *arg1, char *arg2, char *arg3)
+{
+       int size, len;
+       unsigned int mode;
+       unsigned char sha1[20];
+       struct cache_entry *ce;
+
+       if (sscanf(arg1, "%o", &mode) != 1)
+               return -1;
+       printf("got mode %o\n", mode);
+       if (get_sha1_hex(arg2, sha1))
+               return -1;
+       printf("got sha1 %s\n", sha1_to_hex(sha1));
+       if (!verify_path(arg3))
+               return -1;
+       printf("got path %s\n", arg3);
+
+       len = strlen(arg3);
+       size = cache_entry_size(len);
+       ce = malloc(size);
+       memset(ce, 0, size);
+
+       memcpy(ce->sha1, sha1, 20);
+       memcpy(ce->name, arg3, len);
+       ce->ce_flags = htons(len);
+       ce->ce_mode = create_ce_mode(mode);
+       return add_cache_entry(ce, allow_add);
+}
+
 static int remove_lock = 0;
 
 static void remove_lock_file(void)
@@ -245,14 +279,14 @@ int main(int argc, char **argv)
 
        newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
        if (newfd < 0)
-               usage("unable to create new cachefile");
+               die("unable to create new cachefile");
 
        atexit(remove_lock_file);
        remove_lock = 1;
 
        entries = read_cache();
        if (entries < 0)
-               usage("cache corrupted");
+               die("cache corrupted");
 
        for (i = 1 ; i < argc; i++) {
                char *path = argv[i];
@@ -274,18 +308,24 @@ int main(int argc, char **argv)
                                refresh_cache();
                                continue;
                        }
-                       usage("unknown option %s", path);
+                       if (!strcmp(path, "--cacheinfo")) {
+                               if (i+3 >= argc || add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
+                                       die("update-cache: --cacheinfo <mode> <sha1> <path>");
+                               i += 3;
+                               continue;
+                       }
+                       die("unknown option %s", path);
                }
                if (!verify_path(path)) {
                        fprintf(stderr, "Ignoring path %s\n", argv[i]);
                        continue;
                }
                if (add_file_to_cache(path))
-                       usage("Unable to add %s to database", path);
+                       die("Unable to add %s to database", path);
        }
        if (write_cache(newfd, active_cache, active_nr) ||
            rename(".git/index.lock", ".git/index"))
-               usage("Unable to write new cachefile");
+               die("Unable to write new cachefile");
 
        remove_lock = 0;
        return 0;