finish_connect(): thinkofix

[git.git] / verify-pack.c

diff --git a/verify-pack.c b/verify-pack.c
index 77b3d282dad6cb02f2d986e2e2497a38b22f8b5f..357970da391da39eb24a3154923dabd1c9baea53 100644 (file)
--- a/verify-pack.c
+++ b/verify-pack.c
@@ -5,38 +5,51 @@ static int verify_one_pack(const char *path, int verbose)
 {
        char arg[PATH_MAX];
        int len;
-       struct packed_git *g;
+       struct packed_git *pack;
+       int err;
 
        len = strlcpy(arg, path, PATH_MAX);
        if (len >= PATH_MAX)
                return error("name too long: %s", path);
 
-       while (1) {
-               /* Should name foo.idx, but foo.pack may be named;
-                * convert it to foo.idx
-                */
-               if (has_extension(arg, len, ".pack")) {
-                       strcpy(arg + len - 5, ".idx");
-                       len--;
-               }
-               /* Should name foo.idx now */
-               if ((g = add_packed_git(arg, len, 1)))
-                       break;
-               /* No?  did you name just foo? */
+       /*
+        * In addition to "foo.idx" we accept "foo.pack" and "foo";
+        * normalize these forms to "foo.idx" for add_packed_git().
+        */
+       if (has_extension(arg, ".pack")) {
+               strcpy(arg + len - 5, ".idx");
+               len--;
+       } else if (!has_extension(arg, ".idx")) {
+               if (len + 4 >= PATH_MAX)
+                       return error("name too long: %s.idx", arg);
                strcpy(arg + len, ".idx");
                len += 4;
-               if ((g = add_packed_git(arg, len, 1)))
-                       break;
-               return error("packfile %s not found.", arg);
        }
-       return verify_pack(g, verbose);
+
+       /*
+        * add_packed_git() uses our buffer (containing "foo.idx") to
+        * build the pack filename ("foo.pack").  Make sure it fits.
+        */
+       if (len + 1 >= PATH_MAX) {
+               arg[len - 4] = '\0';
+               return error("name too long: %s.pack", arg);
+       }
+
+       pack = add_packed_git(arg, len, 1);
+       if (!pack)
+               return error("packfile %s not found.", arg);
+
+       err = verify_pack(pack, verbose);
+       free(pack);
+
+       return err;
 }
 
 static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";
 
 int main(int ac, char **av)
 {
-       int errs = 0;
+       int err = 0;
        int verbose = 0;
        int no_more_options = 0;
        int nothing_done = 1;
@@ -52,7 +65,7 @@ int main(int ac, char **av)
                }
                else {
                        if (verify_one_pack(av[1], verbose))
-                               errs++;
+                               err = 1;
                        nothing_done = 0;
                }
                ac--; av++;
@@ -61,5 +74,5 @@ int main(int ac, char **av)
        if (nothing_done)
                usage(verify_pack_usage);
 
-       return !!errs;
+       return err;
 }