Merge branch 'busybox' into merge

20 files changed, 228 insertions, 33 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 08b6aa430..de5c44ead 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -8073,36 +8073,40 @@ changepath(const char *new)
         clearcmdentry(firstchange);
         builtinloc = idx_bltin;
 }
-
-#define TEOF 0
-#define TNL 1
-#define TREDIR 2
-#define TWORD 3
-#define TSEMI 4
-#define TBACKGND 5
-#define TAND 6
-#define TOR 7
-#define TPIPE 8
-#define TLP 9
-#define TRP 10
-#define TENDCASE 11
-#define TENDBQUOTE 12
-#define TNOT 13
-#define TCASE 14
-#define TDO 15
-#define TDONE 16
-#define TELIF 17
-#define TELSE 18
-#define TESAC 19
-#define TFI 20
-#define TFOR 21
-#define TIF 22
-#define TIN 23
-#define TTHEN 24
-#define TUNTIL 25
-#define TWHILE 26
-#define TBEGIN 27
-#define TEND 28
+enum {
+        TEOF,
+        TNL,
+        TREDIR,
+        TWORD,
+        TSEMI,
+        TBACKGND,
+        TAND,
+        TOR,
+        TPIPE,
+        TLP,
+        TRP,
+        TENDCASE,
+        TENDBQUOTE,
+        TNOT,
+        TCASE,
+        TDO,
+        TDONE,
+        TELIF,
+        TELSE,
+        TESAC,
+        TFI,
+        TFOR,
+#if ENABLE_ASH_BASH_COMPAT
+        TFUNCTION,
+#endif
+        TIF,
+        TIN,
+        TTHEN,
+        TUNTIL,
+        TWHILE,
+        TBEGIN,
+        TEND
+};
 typedef smallint token_id_t;
 
 /* first char is indicating which tokens mark the end of a list */
@@ -8131,6 +8135,9 @@ static const char *const tokname_array[] = {
         "\1esac",
         "\1fi",
         "\0for",
+#if ENABLE_ASH_BASH_COMPAT
+        "\0function",
+#endif
         "\0if",
         "\0in",
         "\1then",
@@ -11205,6 +11212,7 @@ simplecmd(void)
         int savecheckkwd;
 #if ENABLE_ASH_BASH_COMPAT
         smallint double_brackets_flag = 0;
+        smallint function_flag = 0;
 #endif
 
         args = NULL;
@@ -11221,6 +11229,11 @@ simplecmd(void)
                 t = readtoken();
                 switch (t) {
 #if ENABLE_ASH_BASH_COMPAT
+                case TFUNCTION:
+                        if (peektoken() != TWORD)
+                                raise_error_unexpected_syntax(TWORD);
+                        function_flag = 1;
+                        break;
                 case TAND: /* "&&" */
                 case TOR: /* "||" */
                         if (!double_brackets_flag) {
@@ -11249,6 +11262,29 @@ simplecmd(void)
                                 app = &n->narg.next;
                                 savecheckkwd = 0;
                         }
+#if ENABLE_ASH_BASH_COMPAT
+                        if (function_flag) {
+                                checkkwd = CHKNL | CHKKWD;
+                                switch (peektoken()) {
+                                case TBEGIN:
+                                case TIF:
+                                case TCASE:
+                                case TUNTIL:
+                                case TWHILE:
+                                case TFOR:
+                                        goto do_func;
+                                case TLP:
+                                        function_flag = 0;
+                                        break;
+                                case TWORD:
+                                        if (strcmp("[[", wordtext) == 0)
+                                                goto do_func;
+                                        /* fall through */
+                                default:
+                                        raise_error_unexpected_syntax(-1);
+                                }
+                        }
+#endif
                         break;
                 case TREDIR:
                         *rpp = n = redirnode;
@@ -11256,6 +11292,7 @@ simplecmd(void)
                         parsefname();   /* read name of redirection file */
                         break;
                 case TLP:
+ IF_ASH_BASH_COMPAT(do_func:)
                         if (args && app == &args->narg.next
                          && !vars && !redir
                         ) {
@@ -11263,7 +11300,7 @@ simplecmd(void)
                                 const char *name;
 
                                 /* We have a function */
-                                if (readtoken() != TRP)
+                                if (IF_ASH_BASH_COMPAT(!function_flag &&) readtoken() != TRP)
                                         raise_error_unexpected_syntax(TRP);
                                 name = n->narg.text;
                                 if (!goodname(name)
@@ -11276,6 +11313,7 @@ simplecmd(void)
                                 n->narg.next = parse_command();
                                 return n;
                         }
+                        IF_ASH_BASH_COMPAT(function_flag = 0;)
                         /* fall through */
                 default:
                         tokpushback = 1;
@@ -11456,6 +11494,7 @@ parse_command(void)
                 n1 = list(0);
                 t = TEND;
                 break;
+        IF_ASH_BASH_COMPAT(case TFUNCTION:)
         case TWORD:
         case TREDIR:
                 tokpushback = 1;
diff --git a/shell/ash_test/ash-misc/func1.right b/shell/ash_test/ash-misc/func1.right
new file mode 100644
index 000000000..e21665aaf
--- /dev/null
+++ b/shell/ash_test/ash-misc/func1.right
@@ -0,0 +1,6 @@
+Hello
+Zero: 0
+One: 1 Param1: World
+Zero: 0 Param1: Restored
+Multi line function
+One: 1
diff --git a/shell/ash_test/ash-misc/func1.tests b/shell/ash_test/ash-misc/func1.tests
new file mode 100755
index 000000000..ffb269fad
--- /dev/null
+++ b/shell/ash_test/ash-misc/func1.tests
@@ -0,0 +1,16 @@
+f() { echo Hello; }
+g () { echo One: $# Param1: $1; }
+h ( )
+{
+    echo -n 'Multi ' && echo -n 'line '
+    echo function
+    false
+}
+
+f
+echo Zero: $?
+set -- Restored
+{ g World; }
+echo Zero: $? Param1: $1
+( h )
+echo One: $?
diff --git a/shell/ash_test/ash-misc/func2.right b/shell/ash_test/ash-misc/func2.right
new file mode 100644
index 000000000..f2a041da7
--- /dev/null
+++ b/shell/ash_test/ash-misc/func2.right
@@ -0,0 +1,5 @@
+First 0
+Second 0
+First 1
+Second 1
+Done
diff --git a/shell/ash_test/ash-misc/func2.tests b/shell/ash_test/ash-misc/func2.tests
new file mode 100755
index 000000000..763203f15
--- /dev/null
+++ b/shell/ash_test/ash-misc/func2.tests
@@ -0,0 +1,9 @@
+i=0
+while test $i != 2; do
+    f() { echo First $i; }
+    f
+    f() { echo Second $i; }
+    f
+    : $((i++))
+done
+echo Done
diff --git a/shell/ash_test/ash-misc/func3.right b/shell/ash_test/ash-misc/func3.right
new file mode 100644
index 000000000..b6d73459a
--- /dev/null
+++ b/shell/ash_test/ash-misc/func3.right
@@ -0,0 +1,4 @@
+One:1
+Zero:0
+One:1
+Five:5
diff --git a/shell/ash_test/ash-misc/func3.tests b/shell/ash_test/ash-misc/func3.tests
new file mode 100755
index 000000000..fa6f26a23
--- /dev/null
+++ b/shell/ash_test/ash-misc/func3.tests
@@ -0,0 +1,8 @@
+f() { false; return; echo BAD; };
+{ f; echo One:$?; }; echo Zero:$?
+
+f() { false; return; };
+f; echo One:$?
+
+f() { return 5; };
+f; echo Five:$?
diff --git a/shell/ash_test/ash-misc/func4.right b/shell/ash_test/ash-misc/func4.right
new file mode 100644
index 000000000..0c87e316a
--- /dev/null
+++ b/shell/ash_test/ash-misc/func4.right
@@ -0,0 +1,2 @@
+24
+Done
diff --git a/shell/ash_test/ash-misc/func4.tests b/shell/ash_test/ash-misc/func4.tests
new file mode 100755
index 000000000..74c1b9a46
--- /dev/null
+++ b/shell/ash_test/ash-misc/func4.tests
@@ -0,0 +1,7 @@
+func() {
+        eval "echo \"\${val_${1}}\""
+}
+
+val_x=24
+(func x)
+echo Done
diff --git a/shell/ash_test/ash-misc/func5.right b/shell/ash_test/ash-misc/func5.right
new file mode 100644
index 000000000..2c9d316b3
--- /dev/null
+++ b/shell/ash_test/ash-misc/func5.right
@@ -0,0 +1,6 @@
+1
+2
+3
+1
+2
+3
diff --git a/shell/ash_test/ash-misc/func5.tests b/shell/ash_test/ash-misc/func5.tests
new file mode 100755
index 000000000..e967208cc
--- /dev/null
+++ b/shell/ash_test/ash-misc/func5.tests
@@ -0,0 +1,13 @@
+f() { echo $1; }
+f 1
+
+f() ( echo $1; )
+f 2
+
+f() ( echo $1 )
+f 3
+
+f() for i in 1 2 3; do
+        echo $i
+done
+f
diff --git a/shell/ash_test/ash-misc/func_args1.right b/shell/ash_test/ash-misc/func_args1.right
new file mode 100644
index 000000000..2dfb9629b
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_args1.right
@@ -0,0 +1,5 @@
+params: a b c
+'f 1 2 3' called
+params: a b c
+'f 1 2 3' called
+params: a b c
diff --git a/shell/ash_test/ash-misc/func_args1.tests b/shell/ash_test/ash-misc/func_args1.tests
new file mode 100755
index 000000000..d394c637f
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_args1.tests
@@ -0,0 +1,8 @@
+f() { echo "'f $1 $2 $3' called"; }
+
+set -- a b c
+echo "params: $1 $2 $3"
+f 1 2 3
+echo "params: $1 $2 $3"
+true | f 1 2 3
+echo "params: $1 $2 $3"
diff --git a/shell/ash_test/ash-misc/func_bash1.right b/shell/ash_test/ash-misc/func_bash1.right
new file mode 100644
index 000000000..41bf8828c
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_bash1.right
@@ -0,0 +1,12 @@
+1
+2
+3
+1
+2
+3
+1
+2
+3
+1
+2
+3
diff --git a/shell/ash_test/ash-misc/func_bash1.tests b/shell/ash_test/ash-misc/func_bash1.tests
new file mode 100755
index 000000000..2cc0970e8
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_bash1.tests
@@ -0,0 +1,28 @@
+function f() { echo $1; }
+f 1
+
+function f() ( echo $1; )
+f 2
+
+function f() ( echo $1 )
+f 3
+
+function f() for i in 1 2 3; do
+        echo $i
+done
+f
+
+function f { echo $1; }
+f 1
+
+# the next two don't work
+#function f ( echo $1; )
+f 2
+
+#function f ( echo $1 )
+f 3
+
+function f for i in 1 2 3; do
+        echo $i
+done
+f
diff --git a/shell/ash_test/ash-misc/func_local1.right b/shell/ash_test/ash-misc/func_local1.right
new file mode 100644
index 000000000..312178366
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_local1.right
@@ -0,0 +1,3 @@
+z=a
+z=z
+Done
diff --git a/shell/ash_test/ash-misc/func_local1.tests b/shell/ash_test/ash-misc/func_local1.tests
new file mode 100755
index 000000000..1d594e20c
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_local1.tests
@@ -0,0 +1,5 @@
+export z=z
+f() { local z=a; env | grep ^z; }
+f
+env | grep ^z
+echo Done
diff --git a/shell/ash_test/ash-misc/func_local2.right b/shell/ash_test/ash-misc/func_local2.right
new file mode 100644
index 000000000..fe9343ac8
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_local2.right
@@ -0,0 +1,14 @@
+1
+2
+1
+2
+1
+1
+2
+2
+3
+2
+2
+3
+1
+Done
diff --git a/shell/ash_test/ash-misc/func_local2.tests b/shell/ash_test/ash-misc/func_local2.tests
new file mode 100755
index 000000000..1a9ae559d
--- /dev/null
+++ b/shell/ash_test/ash-misc/func_local2.tests
@@ -0,0 +1,7 @@
+x=1
+f() { echo $x; local x=$((x+1)); echo $x; }
+g() { f; echo $x; f; local x=$((x+1)); f; echo $x; f; }
+f
+g
+echo $x
+echo Done
diff --git a/shell/hush_test/hush-misc/func_args1.tests b/shell/hush_test/hush-misc/func_args1.tests
index 157921fb1..d394c637f 100755
--- a/shell/hush_test/hush-misc/func_args1.tests
+++ b/shell/hush_test/hush-misc/func_args1.tests
@@ -1,5 +1,3 @@
-# UNFIXED BUG
-
 f() { echo "'f $1 $2 $3' called"; }
 
 set -- a b c