brcm47xx: backport patch from kernel 2.6.37

[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 0ab8fa2..9c23920 100644 (file)
--- a/package/busybox/patches/250-ash_export-n.patch
+++ b/package/busybox/patches/250-ash_export-n.patch
@@ -1,9 +1,9 @@
 --- a/shell/ash.c
 +++ b/shell/ash.c
 --- a/shell/ash.c
 +++ b/shell/ash.c

-@@ -11909,8 +11909,17 @@
+@@ -12429,8 +12429,17 @@ exportcmd(int argc UNUSED_PARAM, char **

        const char *p;
        char **aptr;
        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;
 +      while ((nopt = nextopt("np"))) {
 +      int mask = ~0;
 +      int nopt;
 +      while ((nopt = nextopt("np"))) {


@@ -19,7 +19,7 @@
                aptr = argptr;
                name = *aptr;
                if (name) {
                aptr = argptr;
                name = *aptr;
                if (name) {

-@@ -11922,10 +11931,12 @@
+@@ -12442,10 +12451,12 @@ exportcmd(int argc UNUSED_PARAM, char **

                                        vp = *findvar(hashvar(name), name);
                                        if (vp) {
                                                vp->flags |= flag;
                                        vp = *findvar(hashvar(name), name);
                                        if (vp) {
                                                vp->flags |= flag;