summaryrefslogtreecommitdiff
path: root/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-04 10:43:23 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-04 10:43:23 -0700
commit3d3caf0b78106c390fc5daceb95ee968312765dd (patch)
treed41a558b9e3cc7ad256636f103fdf243a8bf7c19 /notes.c
parentfb8880dea3111deb4b1134471aa36f99285d86dc (diff)
parent74b67638166ca2e66497ede559dbf393e7af8b40 (diff)
downloadgit-3d3caf0b78106c390fc5daceb95ee968312765dd.tar.gz
Sync with 2.4.9
Diffstat (limited to 'notes.c')
-rw-r--r--notes.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/notes.c b/notes.c
index df08209dee..eacd2a61da 100644
--- a/notes.c
+++ b/notes.c
@@ -362,13 +362,14 @@ static int non_note_cmp(const struct non_note *a, const struct non_note *b)
return strcmp(a->path, b->path);
}
-static void add_non_note(struct notes_tree *t, const char *path,
+/* note: takes ownership of path string */
+static void add_non_note(struct notes_tree *t, char *path,
unsigned int mode, const unsigned char *sha1)
{
struct non_note *p = t->prev_non_note, *n;
n = (struct non_note *) xmalloc(sizeof(struct non_note));
n->next = NULL;
- n->path = xstrdup(path);
+ n->path = path;
n->mode = mode;
hashcpy(n->sha1, sha1);
t->prev_non_note = n;
@@ -482,17 +483,17 @@ handle_non_note:
* component.
*/
{
- char non_note_path[PATH_MAX];
- char *p = non_note_path;
+ struct strbuf non_note_path = STRBUF_INIT;
const char *q = sha1_to_hex(subtree->key_sha1);
int i;
for (i = 0; i < prefix_len; i++) {
- *p++ = *q++;
- *p++ = *q++;
- *p++ = '/';
+ strbuf_addch(&non_note_path, *q++);
+ strbuf_addch(&non_note_path, *q++);
+ strbuf_addch(&non_note_path, '/');
}
- strcpy(p, entry.path);
- add_non_note(t, non_note_path, entry.mode, entry.sha1);
+ strbuf_addstr(&non_note_path, entry.path);
+ add_non_note(t, strbuf_detach(&non_note_path, NULL),
+ entry.mode, entry.sha1);
}
}
free(buf);