aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/250-ash_export-n.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/busybox/patches/250-ash_export-n.patch')
-rw-r--r--package/busybox/patches/250-ash_export-n.patch17
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;