X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b0c94d7f56f87751f1a594bc189b204eed800610..35ba8b6c68d8eba32d6d13bfae23d1acbb8ccf47:/package/busybox/patches/250-ash_export-n.patch

diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch
index 99f467256..bcc67d8ee 100644
--- a/package/busybox/patches/250-ash_export-n.patch
+++ b/package/busybox/patches/250-ash_export-n.patch
@@ -1,15 +1,11 @@
-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 @@
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -12344,8 +12344,17 @@ exportcmd(int argc UNUSED_PARAM, char **
  	const char *p;
  	char **aptr;
- 	int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
+ 	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;
@@ -17,12 +13,13 @@ Index: busybox-1.7.2/shell/ash.c
 +			break;
 +		}
 +	}
-+
+ 
+-	if (nextopt("p") != 'p') {
 +	if (nopt != 'p') {
  		aptr = argptr;
  		name = *aptr;
  		if (name) {
-@@ -11323,10 +11333,11 @@
+@@ -12357,10 +12366,12 @@ exportcmd(int argc UNUSED_PARAM, char **
  					vp = *findvar(hashvar(name), name);
  					if (vp) {
  						vp->flags |= flag;
@@ -30,7 +27,7 @@ Index: busybox-1.7.2/shell/ash.c
  						continue;
  					}
  				}
--				setvar(name, p, flag);
+ 				setvar(name, p, flag);
 +				setvar(name, p, flag & mask);
  			} while ((name = *++aptr) != NULL);
  			return 0;