Fix ?: statements.

[git.git] / fsck-cache.c

diff --git a/fsck-cache.c b/fsck-cache.c
index c660391..ca24a1b 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -109,13 +109,19 @@ static int verify_ordered(struct tree_entry_list *a, struct tree_entry_list *b)
 
 static int fsck_tree(struct tree *item)
 {
+       int retval;
        int has_full_path = 0;
+       int has_zero_pad = 0;
+       int has_bad_modes = 0;
+       int has_dup_entries = 0;
+       int not_properly_sorted = 0;
        struct tree_entry_list *entry, *last;
 
        last = NULL;
        for (entry = item->entries; entry; entry = entry->next) {
                if (strchr(entry->name, '/'))
                        has_full_path = 1;
+               has_zero_pad |= entry->zeropad;
 
                switch (entry->mode) {
                /*
@@ -135,22 +141,17 @@ static int fsck_tree(struct tree *item)
                        if (!check_strict)
                                break;
                default:
-                       printf("tree %s has entry %o %s\n",
-                               sha1_to_hex(item->object.sha1),
-                               entry->mode, entry->name);
+                       has_bad_modes = 1;
                }
 
                if (last) {
                        switch (verify_ordered(last, entry)) {
                        case TREE_UNORDERED:
-                               fprintf(stderr, "tree %s not ordered\n",
-                                       sha1_to_hex(item->object.sha1));
-                               return -1;
+                               not_properly_sorted = 1;
+                               break;
                        case TREE_HAS_DUPS:
-                               fprintf(stderr, "tree %s has duplicate entries for '%s'\n",
-                                       sha1_to_hex(item->object.sha1),
-                                       entry->name);
-                               return -1;
+                               has_dup_entries = 1;
+                               break;
                        default:
                                break;
                        }
@@ -159,13 +160,35 @@ static int fsck_tree(struct tree *item)
                last = entry;
        }
 
+       retval = 0;
        if (has_full_path) {
                fprintf(stderr, "warning: git-fsck-cache: tree %s "
                        "has full pathnames in it\n", 
                        sha1_to_hex(item->object.sha1));
        }
-
-       return 0;
+       if (has_zero_pad) {
+               fprintf(stderr, "warning: git-fsck-cache: tree %s "
+                       "has zero-padded file modes in it\n",
+                       sha1_to_hex(item->object.sha1));
+       }
+       if (has_bad_modes) {
+               fprintf(stderr, "warning: git-fsck-cache: tree %s "
+                       "has bad file modes in it\n",
+                       sha1_to_hex(item->object.sha1));
+       }
+       if (has_dup_entries) {
+               fprintf(stderr, "error: git-fsck-cache: tree %s "
+                       "has duplicate file entries\n",
+                       sha1_to_hex(item->object.sha1));
+               retval = -1;
+       }
+       if (not_properly_sorted) {
+               fprintf(stderr, "error: git-fsck-cache: tree %s "
+                       "is not properly sorted\n",
+                       sha1_to_hex(item->object.sha1));
+               retval = -1;
+       }
+       return retval;
 }
 
 static int fsck_commit(struct commit *commit)
@@ -367,7 +390,10 @@ static int fsck_head_link(void)
        char hex[40];
        unsigned char sha1[20];
        static char path[PATH_MAX], link[PATH_MAX];
-       const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+       const char *git_dir;
+
+       git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+       if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
 
        snprintf(path, sizeof(path), "%s/HEAD", git_dir);
        if (readlink(path, link, sizeof(link)) < 0)
@@ -422,7 +448,7 @@ int main(int argc, char **argv)
                        continue;
                }
                if (*arg == '-')
-                       usage("git-fsck-cache [--tags] [[--unreachable] [--cache] [--standalone | --full] <head-sha1>*]");
+                       usage("git-fsck-cache [--tags] [--root] [[--unreachable] [--cache] [--standalone | --full] [--strict] <head-sha1>*]");
        }
 
        if (standalone && check_full)
@@ -433,13 +459,13 @@ int main(int argc, char **argv)
        fsck_head_link();
        fsck_object_dir(get_object_directory());
        if (check_full) {
-               int j;
+               struct alternate_object_database *alt;
                struct packed_git *p;
                prepare_alt_odb();
-               for (j = 0; alt_odb[j].base; j++) {
+               for (alt = alt_odb_list; alt; alt = alt->next) {
                        char namebuf[PATH_MAX];
-                       int namelen = alt_odb[j].name - alt_odb[j].base;
-                       memcpy(namebuf, alt_odb[j].base, namelen);
+                       int namelen = alt->name - alt->base;
+                       memcpy(namebuf, alt->base, namelen);
                        namebuf[namelen - 1] = 0;
                        fsck_object_dir(namebuf);
                }