[PATCH] cat-file: be consistent in usage string and documentation.

diff --git a/fsck-cache.c b/fsck-cache.c
index 4e193524115dfa0ad808514a3baab34240d78cba..8e21bf1327a60840273973c08216c1387aac95b8 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -6,6 +6,7 @@
 #include "tree.h"
 #include "blob.h"
 #include "tag.h"
+#include "refs.h"
 #include "pack.h"
 
 #define REACHABLE 0x0001
@@ -303,76 +304,32 @@ static int fsck_dir(int i, char *path)
        return 0;
 }
 
-static int read_sha1_reference(const char *path)
+static int default_refs = 0;
+
+static int fsck_handle_ref(const char *refname, const unsigned char *sha1)
 {
-       char hexname[60];
-       unsigned char sha1[20];
-       int fd = open(path, O_RDONLY), len;
        struct object *obj;
 
-       if (fd < 0)
-               return -1;
-
-       len = read(fd, hexname, sizeof(hexname));
-       close(fd);
-       if (len < 40)
-               return -1;
-
-       if (get_sha1_hex(hexname, sha1) < 0)
-               return -1;
-
        obj = lookup_object(sha1);
        if (!obj) {
-               if (!standalone && has_sha1_file(sha1))
-                       return 0; /* it is in pack */
-               return error("%s: invalid sha1 pointer %.40s", path, hexname);
+               if (!standalone && has_sha1_file(sha1)) {
+                       default_refs++;
+                       return 0; /* it is in a pack */
+               }
+               error("%s: invalid sha1 pointer %s", refname, sha1_to_hex(sha1));
+               /* We'll continue with the rest despite the error.. */
+               return 0;
        }
-
+       default_refs++;
        obj->used = 1;
        mark_reachable(obj, REACHABLE);
        return 0;
 }
 
-static int find_file_objects(const char *base, const char *name)
-{
-       int baselen = strlen(base);
-       int namelen = strlen(name);
-       char *path = xmalloc(baselen + namelen + 2);
-       struct stat st;
-
-       memcpy(path, base, baselen);
-       path[baselen] = '/';
-       memcpy(path + baselen + 1, name, namelen+1);
-       if (stat(path, &st) < 0)
-               return 0;
-
-       /*
-        * Recurse into directories
-        */
-       if (S_ISDIR(st.st_mode)) {
-               int count = 0;
-               DIR *dir = opendir(path);
-               if (dir) {
-                       struct dirent *de;
-                       while ((de = readdir(dir)) != NULL) {
-                               if (de->d_name[0] == '.')
-                                       continue;
-                               count += find_file_objects(path, de->d_name);
-                       }
-                       closedir(dir);
-               }
-               return count;
-       }
-       if (S_ISREG(st.st_mode))
-               return read_sha1_reference(path) == 0;
-       return 0;
-}
-
 static void get_default_heads(void)
 {
-       char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
-       int count = find_file_objects(git_dir, "refs");
-       if (!count)
+       for_each_ref(fsck_handle_ref);
+       if (!default_refs)
                die("No default references");
 }
 
@@ -387,6 +344,31 @@ static void fsck_object_dir(const char *path)
        fsck_sha1_list();
 }
 
+static int fsck_head_link(void)
+{
+       int fd, count;
+       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;
+
+       snprintf(path, sizeof(path), "%s/HEAD", git_dir);
+       if (readlink(path, link, sizeof(link)) < 0)
+               return error("HEAD is not a symlink");
+       if (strncmp("refs/heads/", link, 11))
+               return error("HEAD points to something strange (%s)", link);
+       fd = open(path, O_RDONLY);
+       if (fd < 0)
+               return error("HEAD: %s", strerror(errno));
+       count = read(fd, hex, sizeof(hex));
+       close(fd);
+       if (count < 0)
+               return error("HEAD: %s", strerror(errno));
+       if (count < 40 || get_sha1_hex(hex, sha1))
+               return error("HEAD: not a valid git pointer");
+       return 0;
+}
+
 int main(int argc, char **argv)
 {
        int i, heads;
@@ -427,20 +409,23 @@ int main(int argc, char **argv)
        if (standalone)
                unsetenv("GIT_ALTERNATE_OBJECT_DIRECTORIES");
 
+       fsck_head_link();
        fsck_object_dir(get_object_directory());
        if (check_full) {
                int j;
                struct packed_git *p;
                prepare_alt_odb();
                for (j = 0; alt_odb[j].base; j++) {
-                       alt_odb[j].name[-1] = 0; /* was slash */
-                       fsck_object_dir(alt_odb[j].base);
-                       alt_odb[j].name[-1] = '/';
+                       char namebuf[PATH_MAX];
+                       int namelen = alt_odb[j].name - alt_odb[j].base;
+                       memcpy(namebuf, alt_odb[j].base, namelen);
+                       namebuf[namelen - 1] = 0;
+                       fsck_object_dir(namebuf);
                }
                prepare_packed_git();
                for (p = packed_git; p; p = p->next)
                        /* verify gives error messages itself */
-                       verify_pack(p); 
+                       verify_pack(p, 0);
 
                for (p = packed_git; p; p = p->next) {
                        int num = num_packed_objects(p);