Commit b4600fbe authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

merge-recursive: convert malloc / strcpy to strbuf

This would be a fairly routine use of xstrfmt, except that
we need to remember the length of the result to pass to
cache_name_pos. So just use a strbuf, which makes this

As a bonus, this gets rid of confusing references to
"pathlen+1". The "1" is for the trailing slash we added, but
that is automatically accounted for in the strbuf's len
Signed-off-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent bd22d4ff
......@@ -630,25 +630,24 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
static int dir_in_way(const char *path, int check_working_copy)
int pos, pathlen = strlen(path);
char *dirpath = xmalloc(pathlen + 2);
int pos;
struct strbuf dirpath = STRBUF_INIT;
struct stat st;
strcpy(dirpath, path);
dirpath[pathlen] = '/';
dirpath[pathlen+1] = '\0';
strbuf_addstr(&dirpath, path);
strbuf_addch(&dirpath, '/');
pos = cache_name_pos(dirpath, pathlen+1);
pos = cache_name_pos(dirpath.buf, dirpath.len);
if (pos < 0)
pos = -1 - pos;
if (pos < active_nr &&
!strncmp(dirpath, active_cache[pos]->name, pathlen+1)) {
!strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
return 1;
return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment