git-verify-pack: make builtin

Convert git-verify-pack to a builtin command.  Also rename ac to argc
and av to argv for consistancy.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 733fa660d9032fee8f7ad32fffa9803a113b11af..a3ba585cee3d9f130bed3eddd8b0afa038c76335 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -275,6 +275,7 @@ BUILTIN_OBJS = \
        builtin-update-index.o \
        builtin-update-ref.o \
        builtin-upload-tar.o \
+       builtin-verify-pack.o \
        builtin-write-tree.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)

diff --git a/verify-pack.c b/builtin-verify-pack.c
similarity index 83%
rename from verify-pack.c
rename to builtin-verify-pack.c
index f440a39678b23ebb9d58115f0481875add21e981..d700761e15e5785b8f17b161d5f45925112a214c 100644 (file)
--- a/verify-pack.c
+++ b/builtin-verify-pack.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "pack.h"
 
@@ -47,28 +48,28 @@ static int verify_one_pack(const char *path, int verbose)
 
 static const char verify_pack_usage[] = "git-verify-pack [-v] <pack>...";
 
-int main(int ac, char **av)
+int cmd_verify_pack(int argc, const char **argv, const char *prefix)
 {
        int err = 0;
        int verbose = 0;
        int no_more_options = 0;
        int nothing_done = 1;
 
-       while (1 < ac) {
-               if (!no_more_options && av[1][0] == '-') {
-                       if (!strcmp("-v", av[1]))
+       while (1 < argc) {
+               if (!no_more_options && argv[1][0] == '-') {
+                       if (!strcmp("-v", argv[1]))
                                verbose = 1;
-                       else if (!strcmp("--", av[1]))
+                       else if (!strcmp("--", argv[1]))
                                no_more_options = 1;
                        else
                                usage(verify_pack_usage);
                }
                else {
-                       if (verify_one_pack(av[1], verbose))
+                       if (verify_one_pack(argv[1], verbose))
                                err = 1;
                        nothing_done = 0;
                }
-               ac--; av++;
+               argc--; argv++;
        }
 
        if (nothing_done)

diff --git a/builtin.h b/builtin.h
index c0bdb051bd07775898e7e3a118956024eeb86d78..ade58c4a1f06b161f00caa015192fa89c137d273 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -59,5 +59,6 @@ extern int cmd_upload_tar(int argc, const char **argv, const char *prefix);
 extern int cmd_version(int argc, const char **argv, const char *prefix);
 extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
 extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
+extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
 
 #endif

diff --git a/git.c b/git.c
index db0f86790dd413a96064f2778f7865aedd068e05..5da7787d867365b5a018fd3806fc5d0bfd9b92a2 100644 (file)
--- a/git.c
+++ b/git.c
@@ -270,6 +270,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "version", cmd_version },
                { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
                { "write-tree", cmd_write_tree, RUN_SETUP },
+               { "verify-pack", cmd_verify_pack },
        };
        int i;