summaryrefslogtreecommitdiff
path: root/help.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 18:25:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-16 18:26:00 (GMT)
commit6e4094731acee5207595a8416d19508107ea475d (patch)
treea04d3fe754e34c91216f3a5e2f5450a705fd969d /help.c
parentd518cc0a56b8b22a5d085be8710f082dbabfe1b3 (diff)
parent47bf4b0fc52f3ad5823185a85f5f82325787c84b (diff)
downloadgit-6e4094731acee5207595a8416d19508107ea475d.zip
git-6e4094731acee5207595a8416d19508107ea475d.tar.gz
git-6e4094731acee5207595a8416d19508107ea475d.tar.bz2
Merge branch 'jk/strip-suffix'
* jk/strip-suffix: prepare_packed_git_one: refactor duplicate-pack check verify-pack: use strbuf_strip_suffix strbuf: implement strbuf_strip_suffix index-pack: use strip_suffix to avoid magic numbers use strip_suffix instead of ends_with in simple cases replace has_extension with ends_with implement ends_with via strip_suffix add strip_suffix function sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()
Diffstat (limited to 'help.c')
-rw-r--r--help.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/help.c b/help.c
index f31f29a..7af65e2 100644
--- a/help.c
+++ b/help.c
@@ -144,7 +144,7 @@ static void list_commands_in_dir(struct cmdnames *cmds,
while ((de = readdir(dir)) != NULL) {
const char *ent;
- int entlen;
+ size_t entlen;
if (!skip_prefix(de->d_name, prefix, &ent))
continue;
@@ -155,8 +155,7 @@ static void list_commands_in_dir(struct cmdnames *cmds,
continue;
entlen = strlen(ent);
- if (has_extension(ent, ".exe"))
- entlen -= 4;
+ strip_suffix(ent, ".exe", &entlen);
add_cmdname(cmds, ent, entlen);
}