mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 00:30:16 +02:00
06fe5c22d3
Fix part of bug #6709. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19779 3c298f89-4303-0410-b956-a3cf2f4a3e73
35 lines
766 B
Diff
35 lines
766 B
Diff
--- a/shell/ash.c
|
|
+++ b/shell/ash.c
|
|
@@ -12351,8 +12351,17 @@ exportcmd(int argc UNUSED_PARAM, char **
|
|
const char *p;
|
|
char **aptr;
|
|
int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
|
|
+ int mask = ~0;
|
|
+ int nopt;
|
|
+ while ((nopt = nextopt("np"))) {
|
|
+ if (nopt == 'n') {
|
|
+ mask = ~flag;
|
|
+ } else { /* p */
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
|
|
- if (nextopt("p") != 'p') {
|
|
+ if (nopt != 'p') {
|
|
aptr = argptr;
|
|
name = *aptr;
|
|
if (name) {
|
|
@@ -12364,10 +12373,12 @@ exportcmd(int argc UNUSED_PARAM, char **
|
|
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;
|
|
}
|