mirror of
https://github.com/git/git.git
synced 2024-11-07 01:32:58 +01:00
5bb1cda5f7
As Fredrik points out the current interface of has_extension() is potentially confusing. Its parameters include both a nul-terminated string and a length-limited string. This patch drops the length argument, requiring two nul-terminated strings; all callsites are updated. I checked that all of them indeed provide nul-terminated strings. Filenames need to be nul-terminated anyway if they are to be passed to open() etc. The performance penalty of the additional strlen() is negligible compared to the system calls which inevitably surround has_extension() calls. Additionally, change has_extension() to use size_t inside instead of int, as that is the exact type strlen() returns and memcmp() expects. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
78 lines
1.6 KiB
C
78 lines
1.6 KiB
C
#include "cache.h"
|
|
#include "pack.h"
|
|
|
|
static int verify_one_pack(const char *path, int verbose)
|
|
{
|
|
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, ".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;
|
|
}
|
|
|
|
/*
|
|
* 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 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]))
|
|
verbose = 1;
|
|
else if (!strcmp("--", av[1]))
|
|
no_more_options = 1;
|
|
else
|
|
usage(verify_pack_usage);
|
|
}
|
|
else {
|
|
if (verify_one_pack(av[1], verbose))
|
|
err = 1;
|
|
nothing_done = 0;
|
|
}
|
|
ac--; av++;
|
|
}
|
|
|
|
if (nothing_done)
|
|
usage(verify_pack_usage);
|
|
|
|
return err;
|
|
}
|