summaryrefslogtreecommitdiff
path: root/package/busybox/patches/250-ash_export-n.patch
blob: b5a8794f5a66e9564f3938fbfaa76c0122d7a14e (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
35
36
37
Index: busybox-1.4.2/shell/ash.c
===================================================================
--- busybox-1.4.2.orig/shell/ash.c	2007-06-04 13:21:32.248074216 +0200
+++ busybox-1.4.2/shell/ash.c	2007-06-04 13:21:34.000807760 +0200
@@ -12237,9 +12237,18 @@
 	const char *p;
 	char **aptr;
 	int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
+	int mask = ~0;
 	int notp;
 
-	notp = nextopt("p") - 'p';
+	while ((notp = nextopt("np"))) {
+		if (notp == 'n') {
+				mask = ~flag;
+		} else { /* p */
+			break;
+		}
+	}
+
+	notp -= 'p';
 	if (notp && ((name = *(aptr = argptr)))) {
 		do {
 			if ((p = strchr(name, '=')) != NULL) {
@@ -12247,10 +12256,11 @@
 			} else {
 				if ((vp = *findvar(hashvar(name), name))) {
 					vp->flags |= flag;
+					vp->flags &= mask;
 					continue;
 				}
 			}
-			setvar(name, p, flag);
+			setvar(name, p, flag & mask);
 		} while ((name = *++aptr) != NULL);
 	} else {
 		showvars(argv[0], flag, 0);