Fix ?: statements.

diff --git a/update-cache.c b/update-cache.c
index cc4298ac4fa501136cfec192c047bc92138d5285..63815ed658e9c2007938309458444b218c330d68 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -94,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;
@@ -189,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:
@@ -342,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)
@@ -402,6 +382,7 @@ 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;