openwrt/package/busybox/patches/250-ash_export-n.patch

38 lines
887 B
Diff
Raw Normal View History

Index: busybox-1.7.2/shell/ash.c
===================================================================
--- busybox-1.7.2.orig/shell/ash.c 2007-09-03 13:48:38.000000000 +0200
+++ busybox-1.7.2/shell/ash.c 2007-10-04 14:47:41.607489342 +0200
@@ -11310,8 +11310,18 @@
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;
+ } else { /* p */
+ break;
+ }
+ }
+
+ if (nopt != 'p') {
aptr = argptr;
name = *aptr;
if (name) {
@@ -11323,10 +11333,11 @@
vp = *findvar(hashvar(name), name);
if (vp) {
vp->flags |= flag;
+ vp->flags &= mask;
continue;
}
}
- setvar(name, p, flag);
+ setvar(name, p, flag & mask);
} while ((name = *++aptr) != NULL);
return 0;
}