From 61f5f7823c4f217dd9bad2f1df547f81b9338c76 Mon Sep 17 00:00:00 2001 From: Matheus Izvekov Date: Fri, 9 Jul 2010 19:40:00 +0200 Subject: diff: fix "diff dir1 dir2/". Closes bug 2203 Signed-off-by: Matheus Izvekov Signed-off-by: Denys Vlasenko --- editors/diff.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'editors/diff.c') diff --git a/editors/diff.c b/editors/diff.c index 07594e8d8..8d91b83bf 100644 --- a/editors/diff.c +++ b/editors/diff.c @@ -760,9 +760,11 @@ static int FAST_FUNC add_to_dirlist(const char *filename, void *userdata, int depth UNUSED_PARAM) { struct dlist *const l = userdata; + const char *file = filename + l->len; l->dl = xrealloc_vector(l->dl, 6, l->e); - /* + 1 skips "/" after dirname */ - l->dl[l->e] = xstrdup(filename + l->len + 1); + while(*file == '/') + file++; + l->dl[l->e] = xstrdup(file); l->e++; return TRUE; } -- cgit v1.2.3