[package] uhttpd: rework CyaSSL and OpenSSL integration; move protected recv() and...

[openwrt.git] / 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 8ee2aee..048c236 100644 (file)
--- 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-09-03 13:48:38.000000000 +0200
-+++ busybox-1.7.2/shell/ash.c  2007-10-04 14:47:41.607489342 +0200
-@@ -11310,8 +11310,18 @@
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -12611,8 +12611,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 @@
+@@ -12624,10 +12633,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;