[PATCH] Allow setup_work_tree() to be called several times
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Aug 2, 2007, 22:04 UTC
- Message-ID
- <Pine.LNX.4.64.0708022302360.14781@racer.site>
- In-Reply-To
- <7vk5sdtxx0.fsf@assigned-by-dhcp.cox.net>
setup_work_tree() used to rely on a static buffer being initialized to all zeroes. While at it, unstatify a pointer.
Noticed by Alex Riesen.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ---
On Thu, 2 Aug 2007, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > > >> Static is supposed to be zeroed and also is supposed to retain > >> the value from the previous call. I am guessing from the change > >> to make "rel" to non-static that this function is called twice > >> perhaps? > > > > Apparently (but I would feel safer with strlcpy() anyway)... > > Yup, send an appliable "final" version, somebody please?
Here you are.
> > ... git-read-tree > > is the first and only offender which comes up in the test suite: > > It is unclear. > > Is this an optimization, or enforcing the new world order? IOW, > is it now banned to call setup twice?
It is purely an optimization, because we allow calling setup twice with this patch... but we do not recommend it, as it is unnecessary.
setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/setup.c b/setup.c index 3653092..16745f9 100644 --- a/setup.c +++ b/setup.c @@ -201,15 +201,15 @@ int is_inside_work_tree(void) */ const char *set_work_tree(const char *dir) { - char dir_buffer[PATH_MAX]; - static char buffer[PATH_MAX + 1], *rel = NULL; + char dir_buffer[PATH_MAX], *rel = NULL; + static char buffer[PATH_MAX + 1]; int len, postfix_len = strlen(DEFAULT_GIT_DIR_ENVIRONMENT) + 1; /* strip the variable 'dir' of the postfix "/.git" if it has it */ len = strlen(dir); if (len > postfix_len && !strcmp(dir + len - postfix_len, "/" DEFAULT_GIT_DIR_ENVIRONMENT)) { - strncpy(dir_buffer, dir, len - postfix_len); + strlcpy(dir_buffer, dir, len - postfix_len + 1); /* are we inside the default work tree? */ rel = get_relative_cwd(buffer, sizeof(buffer), dir_buffer);
-- 1.5.3.rc3.121.g7f37