summaryrefslogtreecommitdiff
path: root/verify-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-10 21:17:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-10 21:17:49 (GMT)
commit44e1d764d0d3123a614377e10655b4348cf57771 (patch)
tree70154ab1c6ce2a4e8756770132de1b05552252c8 /verify-pack.c
parent102cb08521df5f33b30c0ef41a1078a61e593943 (diff)
parent0eaf22f4c4bba89457e733264e71343368712793 (diff)
downloadgit-44e1d764d0d3123a614377e10655b4348cf57771.zip
git-44e1d764d0d3123a614377e10655b4348cf57771.tar.gz
git-44e1d764d0d3123a614377e10655b4348cf57771.tar.bz2
Merge branch 'master' into mk/rename
* master: git-verify-pack: no need to count errors git-verify-pack: buffer overrun paranoia git-verify-pack: free pack after use and a cleanup git-verify-pack: get rid of while loop git-verify-pack: insist on .idx extension git-verify-pack: more careful path handling git-verify-pack: show usage when no pack was specified Add has_extension() builtin-apply: remove unused increment Fix git-diff A...B combine-diff: use color git-apply: applying a patch to make a symlink shorter. allow diff.renamelimit to be set regardless of -M/-C make --find-copies-harder imply -C find_unique_abbrev() with len=0 should not abbreviate check return value from diff_setup_done() Fix tutorial-2.html Documentation: git-status takes the same options as git-commit Update git-init-db(1) and documentation of core.sharedRepository
Diffstat (limited to 'verify-pack.c')
-rw-r--r--verify-pack.c75
1 files changed, 48 insertions, 27 deletions
diff --git a/verify-pack.c b/verify-pack.c
index c99db9dd..f440a39 100644
--- a/verify-pack.c
+++ b/verify-pack.c
@@ -1,43 +1,60 @@
#include "cache.h"
#include "pack.h"
-static int verify_one_pack(char *arg, int verbose)
+static int verify_one_pack(const char *path, int verbose)
{
- int len = strlen(arg);
- struct packed_git *g;
-
- while (1) {
- /* Should name foo.idx, but foo.pack may be named;
- * convert it to foo.idx
- */
- if (!strcmp(arg + len - 5, ".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? */
+ char arg[PATH_MAX];
+ int len;
+ struct packed_git *pack;
+ int err;
+
+ len = strlcpy(arg, path, PATH_MAX);
+ if (len >= PATH_MAX)
+ return error("name too long: %s", path);
+
+ /*
+ * 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, len, ".pack")) {
+ strcpy(arg + len - 5, ".idx");
+ len--;
+ } else if (!has_extension(arg, len, ".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;
while (1 < ac) {
- char path[PATH_MAX];
-
if (!no_more_options && av[1][0] == '-') {
if (!strcmp("-v", av[1]))
verbose = 1;
@@ -47,11 +64,15 @@ int main(int ac, char **av)
usage(verify_pack_usage);
}
else {
- strcpy(path, av[1]);
- if (verify_one_pack(path, verbose))
- errs++;
+ if (verify_one_pack(av[1], verbose))
+ err = 1;
+ nothing_done = 0;
}
ac--; av++;
}
- return !!errs;
+
+ if (nothing_done)
+ usage(verify_pack_usage);
+
+ return err;
}