allow routed mode operation again
Fix part of bug #6709. SVN-Revision: 19779
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 = '=';
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user