diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-08-20 14:00:34 +0000 |
| commit | 1e82faaa5e835b00676421b1c63bef541f8ca0d3 (patch) | |
| tree | abda8ea9d70f7d10c897cf214028b9037b17f784 /package/busybox/patches/250-ash_export-n.patch | |
| parent | e3d9bc5779a012df82e2c48af3bef81bb011257a (diff) | |
| download | upstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.gz upstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.tar.bz2 upstream-1e82faaa5e835b00676421b1c63bef541f8ca0d3.zip | |
upgrade busybox to v1.11.1 and add current upstream fixes
SVN-Revision: 12348
Diffstat (limited to 'package/busybox/patches/250-ash_export-n.patch')
| -rw-r--r-- | package/busybox/patches/250-ash_export-n.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch index 99f4672565..8243a50521 100644 --- a/package/busybox/patches/250-ash_export-n.patch +++ b/package/busybox/patches/250-ash_export-n.patch @@ -1,15 +1,11 @@ -Index: busybox-1.7.2/shell/ash.c -=================================================================== ---- busybox-1.7.2.orig/shell/ash.c 2007-10-30 15:34:59.000000000 -0500 -+++ busybox-1.7.2/shell/ash.c 2007-10-30 15:35:02.000000000 -0500 -@@ -11310,8 +11310,18 @@ +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -11875,8 +11875,17 @@ const char *p; char **aptr; int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT; + int mask = ~0; + int nopt; - -- if (nextopt("p") != 'p') { + while ((nopt = nextopt("np"))) { + if (nopt == 'n') { + mask = ~flag; @@ -17,12 +13,13 @@ Index: busybox-1.7.2/shell/ash.c + break; + } + } -+ + +- if (nextopt("p") != 'p') { + if (nopt != 'p') { aptr = argptr; name = *aptr; if (name) { -@@ -11323,10 +11333,11 @@ +@@ -11888,10 +11897,12 @@ vp = *findvar(hashvar(name), name); if (vp) { vp->flags |= flag; @@ -30,7 +27,7 @@ Index: busybox-1.7.2/shell/ash.c continue; } } -- setvar(name, p, flag); + setvar(name, p, flag); + setvar(name, p, flag & mask); } while ((name = *++aptr) != NULL); return 0; |