summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMatheus Izvekov2010-07-09 19:40:00 +0200
committerDenys Vlasenko2010-07-09 19:40:00 +0200
commit61f5f7823c4f217dd9bad2f1df547f81b9338c76 (patch)
tree3175e3e36be86c6cbd5534f17c40eb10caf039a4 /editors
parent1883cb174619cfc90ca86da08598f470d3a11315 (diff)
downloadbusybox-61f5f7823c4f217dd9bad2f1df547f81b9338c76.zip
busybox-61f5f7823c4f217dd9bad2f1df547f81b9338c76.tar.gz
diff: fix "diff dir1 dir2/". Closes bug 2203
Signed-off-by: Matheus Izvekov <mizvekov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors')
-rw-r--r--editors/diff.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/editors/diff.c b/editors/diff.c
index 07594e8..8d91b83 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;
}