undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-verify-pack: make builtin

Browse Source 
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>
This commit is contained in:
Rene Scharfe 2006-08-10 17:02:38 +02:00 committed by Junio C Hamano
parent 44e1d764d0
commit 2e3ed670eb
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -275,6 +275,7 @@ BUILTIN_OBJS = \
builtin-update-index.o \ builtin-update-index.o \
builtin-update-ref.o \ builtin-update-ref.o \
builtin-upload-tar.o \ builtin-upload-tar.o \
builtin-verify-pack.o \
builtin-write-tree.o builtin-write-tree.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB) GITLIBS = $(LIB_FILE) $(XDIFF_LIB)

15
verify-pack.c → builtin-verify-pack.c
View File

@ -1,3 +1,4 @@
#include "builtin.h"
#include "cache.h" #include "cache.h"
#include "pack.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>..."; 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 err = 0;
int verbose = 0; int verbose = 0;
int no_more_options = 0; int no_more_options = 0;
int nothing_done = 1; int nothing_done = 1;
while (1 < ac) { while (1 < argc) {
if (!no_more_options && av[1][0] == '-') { if (!no_more_options && argv[1][0] == '-') {
if (!strcmp("-v", av[1])) if (!strcmp("-v", argv[1]))
verbose = 1; verbose = 1;
else if (!strcmp("--", av[1])) else if (!strcmp("--", argv[1]))
no_more_options = 1; no_more_options = 1;
else else
usage(verify_pack_usage); usage(verify_pack_usage);
} }
else { else {
if (verify_one_pack(av[1], verbose)) if (verify_one_pack(argv[1], verbose))
err = 1; err = 1;
nothing_done = 0; nothing_done = 0;
} }
ac--; av++; argc--; argv++;
} }
if (nothing_done) if (nothing_done)

1
builtin.h
View File

@ -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_version(int argc, const char **argv, const char *prefix);
extern int cmd_whatchanged(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_write_tree(int argc, const char **argv, const char *prefix);
extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
#endif #endif

1
git.c
View File

@ -270,6 +270,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "version", cmd_version }, { "version", cmd_version },
{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER }, { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
{ "write-tree", cmd_write_tree, RUN_SETUP }, { "write-tree", cmd_write_tree, RUN_SETUP },
{ "verify-pack", cmd_verify_pack },
}; };
int i; int i;