drop length argument of has_extension
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>
This commit is contained in:
parent
ca9e3b124f
commit
5bb1cda5f7
@ -140,7 +140,7 @@ static void list_commands(const char *exec_path, const char *pattern)
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
entlen = strlen(de->d_name);
|
entlen = strlen(de->d_name);
|
||||||
if (has_extension(de->d_name, entlen, ".exe"))
|
if (has_extension(de->d_name, ".exe"))
|
||||||
entlen -= 4;
|
entlen -= 4;
|
||||||
|
|
||||||
if (longest < entlen)
|
if (longest < entlen)
|
||||||
|
@ -139,9 +139,10 @@ static inline ssize_t xwrite(int fd, const void *buf, size_t len)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int has_extension(const char *filename, int len, const char *ext)
|
static inline int has_extension(const char *filename, const char *ext)
|
||||||
{
|
{
|
||||||
int extlen = strlen(ext);
|
size_t len = strlen(filename);
|
||||||
|
size_t extlen = strlen(ext);
|
||||||
return len > extlen && !memcmp(filename + len - extlen, ext, extlen);
|
return len > extlen && !memcmp(filename + len - extlen, ext, extlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -870,7 +870,7 @@ static void process_ls_pack(struct remote_ls_ctx *ls)
|
|||||||
|
|
||||||
if (strlen(ls->dentry_name) == 63 &&
|
if (strlen(ls->dentry_name) == 63 &&
|
||||||
!strncmp(ls->dentry_name, "objects/pack/pack-", 18) &&
|
!strncmp(ls->dentry_name, "objects/pack/pack-", 18) &&
|
||||||
has_extension(ls->dentry_name, 63, ".pack")) {
|
has_extension(ls->dentry_name, ".pack")) {
|
||||||
get_sha1_hex(ls->dentry_name + 18, sha1);
|
get_sha1_hex(ls->dentry_name + 18, sha1);
|
||||||
setup_index(ls->repo, sha1);
|
setup_index(ls->repo, sha1);
|
||||||
}
|
}
|
||||||
|
@ -447,7 +447,7 @@ int main(int argc, char **argv)
|
|||||||
usage(index_pack_usage);
|
usage(index_pack_usage);
|
||||||
if (!index_name) {
|
if (!index_name) {
|
||||||
int len = strlen(pack_name);
|
int len = strlen(pack_name);
|
||||||
if (!has_extension(pack_name, len, ".pack"))
|
if (!has_extension(pack_name, ".pack"))
|
||||||
die("packfile name '%s' does not end with '.pack'",
|
die("packfile name '%s' does not end with '.pack'",
|
||||||
pack_name);
|
pack_name);
|
||||||
index_name_buf = xmalloc(len);
|
index_name_buf = xmalloc(len);
|
||||||
|
@ -44,7 +44,7 @@ static int setup_indices(void)
|
|||||||
while ((de = readdir(dir)) != NULL) {
|
while ((de = readdir(dir)) != NULL) {
|
||||||
int namelen = strlen(de->d_name);
|
int namelen = strlen(de->d_name);
|
||||||
if (namelen != 50 ||
|
if (namelen != 50 ||
|
||||||
!has_extension(de->d_name, namelen, ".pack"))
|
!has_extension(de->d_name, ".pack"))
|
||||||
continue;
|
continue;
|
||||||
get_sha1_hex(de->d_name + 5, sha1);
|
get_sha1_hex(de->d_name + 5, sha1);
|
||||||
setup_index(sha1);
|
setup_index(sha1);
|
||||||
|
2
refs.c
2
refs.c
@ -147,7 +147,7 @@ static int do_for_each_ref(const char *base, int (*fn)(const char *path, const u
|
|||||||
namelen = strlen(de->d_name);
|
namelen = strlen(de->d_name);
|
||||||
if (namelen > 255)
|
if (namelen > 255)
|
||||||
continue;
|
continue;
|
||||||
if (has_extension(de->d_name, namelen, ".lock"))
|
if (has_extension(de->d_name, ".lock"))
|
||||||
continue;
|
continue;
|
||||||
memcpy(path + baselen, de->d_name, namelen+1);
|
memcpy(path + baselen, de->d_name, namelen+1);
|
||||||
if (stat(git_path("%s", path), &st) < 0)
|
if (stat(git_path("%s", path), &st) < 0)
|
||||||
|
@ -590,7 +590,7 @@ static void prepare_packed_git_one(char *objdir, int local)
|
|||||||
int namelen = strlen(de->d_name);
|
int namelen = strlen(de->d_name);
|
||||||
struct packed_git *p;
|
struct packed_git *p;
|
||||||
|
|
||||||
if (!has_extension(de->d_name, namelen, ".idx"))
|
if (!has_extension(de->d_name, ".idx"))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* we have .idx. Is it a file we can map? */
|
/* we have .idx. Is it a file we can map? */
|
||||||
|
@ -16,10 +16,10 @@ static int verify_one_pack(const char *path, int verbose)
|
|||||||
* In addition to "foo.idx" we accept "foo.pack" and "foo";
|
* In addition to "foo.idx" we accept "foo.pack" and "foo";
|
||||||
* normalize these forms to "foo.idx" for add_packed_git().
|
* normalize these forms to "foo.idx" for add_packed_git().
|
||||||
*/
|
*/
|
||||||
if (has_extension(arg, len, ".pack")) {
|
if (has_extension(arg, ".pack")) {
|
||||||
strcpy(arg + len - 5, ".idx");
|
strcpy(arg + len - 5, ".idx");
|
||||||
len--;
|
len--;
|
||||||
} else if (!has_extension(arg, len, ".idx")) {
|
} else if (!has_extension(arg, ".idx")) {
|
||||||
if (len + 4 >= PATH_MAX)
|
if (len + 4 >= PATH_MAX)
|
||||||
return error("name too long: %s.idx", arg);
|
return error("name too long: %s.idx", arg);
|
||||||
strcpy(arg + len, ".idx");
|
strcpy(arg + len, ".idx");
|
||||||
|
Loading…
Reference in New Issue
Block a user