summaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/250-ash_export-n.patch
blob: 6a420e221f47109ed68ed777692d86dd8d329251 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12360,8 +12360,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) {
@@ -12373,10 +12382,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;
 		}