Fix ?: statements.
[gitweb.git] / update-cache.c
index 48b4deeebc92db2bcef97141bb1c162ef4e3dea7..63815ed658e9c2007938309458444b218c330d68 100644 (file)
@@ -12,7 +12,8 @@
  * like "git-update-cache *" and suddenly having all the object
  * files be revision controlled.
  */
-static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0;
+static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0, quiet = 0, info_only = 0;
+static int force_remove;
 
 /* Three functions to allow overloaded pointer return; see linux/err.h */
 static inline void *ERR_PTR(long error)
@@ -67,7 +68,7 @@ static int add_file_to_cache(char *path)
                fd = open(path, O_RDONLY);
                if (fd < 0)
                        return -1;
-               if (index_fd(ce->sha1, fd, &st) < 0)
+               if (index_fd(ce->sha1, fd, &st, !info_only, NULL) < 0)
                        return -1;
                break;
        case S_IFLNK:
@@ -76,7 +77,12 @@ static int add_file_to_cache(char *path)
                        free(target);
                        return -1;
                }
-               if (write_sha1_file(target, st.st_size, "blob", ce->sha1))
+               if (info_only) {
+                       unsigned char hdr[50];
+                       int hdrlen;
+                       write_sha1_file_prepare(target, st.st_size, "blob",
+                                               ce->sha1, hdr, &hdrlen);
+               } else if (write_sha1_file(target, st.st_size, "blob", ce->sha1))
                        return -1;
                free(target);
                break;
@@ -88,36 +94,15 @@ static int add_file_to_cache(char *path)
        return add_cache_entry(ce, option);
 }
 
-static int match_data(int fd, void *buffer, unsigned long size)
-{
-       while (size) {
-               char compare[1024];
-               int ret = read(fd, compare, sizeof(compare));
-
-               if (ret <= 0 || ret > size || memcmp(buffer, compare, ret))
-                       return -1;
-               size -= ret;
-               buffer += ret;
-       }
-       return 0;
-}
-
-static int compare_data(struct cache_entry *ce, unsigned long expected_size)
+static int compare_data(struct cache_entry *ce, struct stat *st)
 {
        int match = -1;
        int fd = open(ce->name, O_RDONLY);
 
        if (fd >= 0) {
-               void *buffer;
-               unsigned long size;
-               char type[20];
-
-               buffer = read_sha1_file(ce->sha1, type, &size);
-               if (buffer) {
-                       if (size == expected_size && !strcmp(type, "blob"))
-                               match = match_data(fd, buffer, size);
-                       free(buffer);
-               }
+               unsigned char sha1[20];
+               if (!index_fd(sha1, fd, st, 0, NULL))
+                       match = memcmp(sha1, ce->sha1, 20);
                close(fd);
        }
        return match;
@@ -183,7 +168,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
 
        switch (st.st_mode & S_IFMT) {
        case S_IFREG:
-               if (compare_data(ce, st.st_size))
+               if (compare_data(ce, &st))
                        return ERR_PTR(-EINVAL);
                break;
        case S_IFLNK:
@@ -221,10 +206,12 @@ static int refresh_cache(void)
 
                new = refresh_entry(ce);
                if (IS_ERR(new)) {
-                       if (!(not_new && PTR_ERR(new) == -ENOENT)) {
-                               printf("%s: needs update\n", ce->name);
-                               has_errors = 1;
-                       }
+                       if (not_new && PTR_ERR(new) == -ENOENT)
+                               continue;
+                       if (quiet)
+                               continue;
+                       printf("%s: needs update\n", ce->name);
+                       has_errors = 1;
                        continue;
                }
                active_cache_changed = 1;
@@ -334,6 +321,7 @@ int main(int argc, char **argv)
 {
        int i, newfd, entries, has_errors = 0;
        int allow_options = 1;
+       const char *prefix = setup_git_directory();
 
        newfd = hold_index_file_for_update(&cache_file, get_index_file());
        if (newfd < 0)
@@ -351,6 +339,10 @@ int main(int argc, char **argv)
                                allow_options = 0;
                                continue;
                        }
+                       if (!strcmp(path, "-q")) {
+                               quiet = 1;
+                               continue;
+                       }
                        if (!strcmp(path, "--add")) {
                                allow_add = 1;
                                continue;
@@ -375,12 +367,12 @@ int main(int argc, char **argv)
                                i += 3;
                                continue;
                        }
+                       if (!strcmp(path, "--info-only")) {
+                               info_only = 1;
+                               continue;
+                       }
                        if (!strcmp(path, "--force-remove")) {
-                               if (argc <= i + 1)
-                                       die("git-update-cache: --force-remove <path>");
-                               if (remove_file_from_cache(argv[i+1]))
-                                       die("git-update-cache: --force-remove cannot remove %s", argv[i+1]);
-                               i++;
+                               force_remove = 1;
                                continue;
                        }
 
@@ -390,10 +382,16 @@ int main(int argc, char **argv)
                        }
                        die("unknown option %s", path);
                }
+               path = prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
                if (!verify_path(path)) {
                        fprintf(stderr, "Ignoring path %s\n", argv[i]);
                        continue;
                }
+               if (force_remove) {
+                       if (remove_file_from_cache(path))
+                               die("git-update-cache: --force-remove cannot remove %s", path);
+                       continue;
+               }
                if (add_file_to_cache(path))
                        die("Unable to add %s to database", path);
        }