aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-02-20 13:18:34 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-02-20 13:18:34 +0000
commitb52345c9ed59d27da97f266fc217216ef81ac0ec (patch)
tree8505af26d24c23feaadee0a71df65010ee08bbd8 /package/busybox
parent3651c9804b32db19fa2e2cfd41f7dec75d143d22 (diff)
downloadupstream-b52345c9ed59d27da97f266fc217216ef81ac0ec.tar.gz
upstream-b52345c9ed59d27da97f266fc217216ef81ac0ec.tar.bz2
upstream-b52345c9ed59d27da97f266fc217216ef81ac0ec.zip
allow routed mode operation again
Fix part of bug #6709. SVN-Revision: 19779
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/patches/250-ash_export-n.patch4
-rw-r--r--package/busybox/patches/510-awk_include.patch8
2 files changed, 6 insertions, 6 deletions
diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch
index 6a420e221f..92b198ce57 100644
--- a/package/busybox/patches/250-ash_export-n.patch
+++ b/package/busybox/patches/250-ash_export-n.patch
@@ -1,6 +1,6 @@
--- a/shell/ash.c
+++ b/shell/ash.c
-@@ -12360,8 +12360,17 @@ exportcmd(int argc UNUSED_PARAM, char **
+@@ -12351,8 +12351,17 @@ exportcmd(int argc UNUSED_PARAM, char **
const char *p;
char **aptr;
int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
@@ -19,7 +19,7 @@
aptr = argptr;
name = *aptr;
if (name) {
-@@ -12373,10 +12382,12 @@ exportcmd(int argc UNUSED_PARAM, char **
+@@ -12364,10 +12373,12 @@ exportcmd(int argc UNUSED_PARAM, char **
vp = *findvar(hashvar(name), name);
if (vp) {
vp->flags |= flag;
diff --git a/package/busybox/patches/510-awk_include.patch b/package/busybox/patches/510-awk_include.patch
index 50f6cc549a..b9d7d7137e 100644
--- a/package/busybox/patches/510-awk_include.patch
+++ b/package/busybox/patches/510-awk_include.patch
@@ -34,7 +34,7 @@
chain_group();
clear_array(ahash);
-@@ -2408,7 +2414,8 @@ static var *evaluate(node *op, var *res)
+@@ -2410,7 +2416,8 @@ static var *evaluate(node *op, var *res)
break;
case XC( OC_FUNC ):
@@ -44,7 +44,7 @@
syntax_error(EMSG_UNDEF_FUNC);
X.v = R.v = nvalloc(op->r.f->nargs+1);
-@@ -2425,7 +2432,10 @@ static var *evaluate(node *op, var *res)
+@@ -2427,7 +2434,10 @@ static var *evaluate(node *op, var *res)
fnargs = X.v;
L.s = g_progname;
@@ -56,7 +56,7 @@
g_progname = L.s;
nvfree(fnargs);
-@@ -2788,6 +2798,143 @@ static rstream *next_input_file(void)
+@@ -2790,6 +2800,143 @@ static rstream *next_input_file(void)
#undef files_happen
}
@@ -200,7 +200,7 @@
int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int awk_main(int argc, char **argv)
{
-@@ -2853,6 +3000,9 @@ int awk_main(int argc, char **argv)
+@@ -2855,6 +3002,9 @@ int awk_main(int argc, char **argv)
*s1 = '=';
}
}