From 5fa0441844b1d23e6a2a3c369651dc8c13712ef6 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Fri, 27 Apr 2012 00:27:00 +0200 Subject: [PATCH] find_containing_dir(): use strbuf in implementation of this function Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- refs.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index 0d81b9e267..623fb55da8 100644 --- a/refs.c +++ b/refs.c @@ -309,20 +309,21 @@ static struct ref_entry *search_for_subdir(struct ref_dir *dir, static struct ref_dir *find_containing_dir(struct ref_dir *dir, const char *refname, int mkdir) { - char *refname_copy = xstrdup(refname); - char *slash; - struct ref_entry *entry; - for (slash = strchr(refname_copy, '/'); slash; slash = strchr(slash + 1, '/')) { - char tmp = slash[1]; - slash[1] = '\0'; - entry = search_for_subdir(dir, refname_copy, mkdir); - slash[1] = tmp; + struct strbuf dirname; + const char *slash; + strbuf_init(&dirname, PATH_MAX); + for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) { + struct ref_entry *entry; + strbuf_add(&dirname, + refname + dirname.len, + (slash + 1) - (refname + dirname.len)); + entry = search_for_subdir(dir, dirname.buf, mkdir); if (!entry) break; dir = &entry->u.subdir; } - free(refname_copy); + strbuf_release(&dirname); return dir; } -- GitLab