mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-18 15:59:43 +02:00
b0c94d7f56
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9463 3c298f89-4303-0410-b956-a3cf2f4a3e73
38 lines
887 B
Diff
38 lines
887 B
Diff
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 @@
|
|
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;
|
|
}
|