Mercurial > hg > aboriginal
changeset 1524:60ef4cdee782
Oops, forgot to check in patch removed by busybox upgrade.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sat, 12 May 2012 21:35:58 -0500 |
parents | 2d589ed56a1d |
children | ec9a72351c38 |
files | sources/patches/busybox-patch.patch |
diffstat | 1 files changed, 0 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/patches/busybox-patch.patch Thu May 10 22:04:19 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -Make -p count "path components" not slashes, so broken /blah//thing paths work. - -diff --git a/editors/patch.c b/editors/patch.c -index 1f2a49b..b1f51cf 100644 ---- a/editors/patch.c -+++ b/editors/patch.c -@@ -482,11 +482,11 @@ int patch_main(int argc UNUSED_PARAM, char **argv) - - // handle -p path truncation. - for (i=0, s = name; *s;) { -+ char *temp = name; -+ - if ((option_mask32 & FLAG_PATHLEN) && TT.prefix == i) break; -- if (*(s++)=='/') { -- name = s; -- i++; -- } -+ while (*(s++)=='/') name = s; -+ if (temp != name) i++; - } - - if (empty) {