[PATCH] Avoid chdir() in list_commands_in_dir()
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 27, 2008, 20:34 UTC
- Message-ID
- <alpine.DEB.1.00.0807272233160.5526@eeepc-johanness>
- In-Reply-To
- <alpine.DEB.1.00.0807272219350.5526@eeepc-johanness>
The function list_commands_in_dir() tried to be lazy and just chdir() to the directory which entries it listed, so that the check if the file is executable could be done on dir->d_name.
However, there is no good reason to jump around wildly just to find all Git commands.
Instead, have a strbuf and construct the full path dynamically.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- help.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/help.c b/help.c index 480befe..7af6582 100644 --- a/help.c +++ b/help.c @@ -426,17 +426,24 @@ static unsigned int list_commands_in_dir(struct cmdnames *cmds, int prefix_len = strlen(prefix); DIR *dir = opendir(path); struct dirent *de; + struct strbuf buf = STRBUF_INIT; + int len; - if (!dir || chdir(path)) + if (!dir) return 0; + strbuf_addf(&buf, "%s/", path); + len = buf.len; + while ((de = readdir(dir)) != NULL) { int entlen; if (prefixcmp(de->d_name, prefix)) continue; - if (!is_executable(de->d_name)) + strbuf_setlen(&buf, len); + strbuf_addstr(&buf, de->d_name); + if (!is_executable(buf.buf)) continue; entlen = strlen(de->d_name) - prefix_len; @@ -449,6 +456,7 @@ static unsigned int list_commands_in_dir(struct cmdnames *cmds, add_cmdname(cmds, de->d_name + prefix_len, entlen); } closedir(dir); + strbuf_release(&buf); return longest; }
-- 1.6.0.rc0.97.ge2309