Merge branch 'busybox' into merge

9 files changed, 156 insertions, 30 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 639f5396a..0d65a225b 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2957,7 +2957,7 @@ cdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         goto docd;
 
  err:
-        ash_msg_and_raise_error("can't cd to %s", dest);
+        ash_msg_and_raise_perror("can't cd to %s", dest);
         /* NOTREACHED */
  out:
         if (flags & CD_PRINT)
@@ -5313,7 +5313,7 @@ forkchild(struct job *jp, union node *n, int mode)
                 if (jp->nprocs == 0) {
                         close(0);
                         if (open(bb_dev_null, O_RDONLY) != 0)
-                                ash_msg_and_raise_error("can't open '%s'", bb_dev_null);
+                                ash_msg_and_raise_perror("can't open '%s'", bb_dev_null);
                 }
         }
         if (oldlvl == 0) {
@@ -5414,7 +5414,7 @@ forkshell(struct job *jp, union node *n, int mode)
                 TRACE(("Fork failed, errno=%d", errno));
                 if (jp)
                         freejob(jp);
-                ash_msg_and_raise_error("can't fork");
+                ash_msg_and_raise_perror("can't fork");
         }
         if (pid == 0) {
                 CLEAR_RANDOM_T(&random_gen); /* or else $RANDOM repeats in child */
@@ -5559,7 +5559,7 @@ openhere(union node *redir)
         IF_PLATFORM_MINGW32(struct forkshell fs);
 
         if (pipe(pip) < 0)
-                ash_msg_and_raise_error("pipe call failed");
+                ash_msg_and_raise_perror("can't create pipe");
         if (redir->type == NHERE) {
                 len = strlen(redir->nhere.doc->narg.text);
                 if (len <= PIPE_BUF) {
@@ -6661,7 +6661,7 @@ evalbackcmd(union node *n, struct backcmd *result)
         }
 
         if (pipe(pip) < 0)
-                ash_msg_and_raise_error("pipe call failed");
+                ash_msg_and_raise_perror("can't create pipe");
         jp = makejob(/*n,*/ 1);
 #if ENABLE_PLATFORM_MINGW32
         result->fs.fpid = FS_EVALBACKCMD;
@@ -9625,7 +9625,7 @@ evalpipe(union node *n, int flags)
                 if (lp->next) {
                         if (pipe(pip) < 0) {
                                 close(prevfd);
-                                ash_msg_and_raise_error("pipe call failed");
+                                ash_msg_and_raise_perror("can't create pipe");
                         }
                 }
 #if ENABLE_PLATFORM_MINGW32
@@ -11058,7 +11058,7 @@ setinputfile(const char *fname, int flags)
                 if (flags & INPUT_NOFILE_OK)
                         goto out;
                 exitstatus = 127;
-                ash_msg_and_raise_error("can't open '%s'", fname);
+                ash_msg_and_raise_perror("can't open '%s'", fname);
         }
         if (fd < 10)
                 fd = savefd(fd);
diff --git a/shell/ash_test/ash-getopts/getopt_nested.right b/shell/ash_test/ash-getopts/getopt_nested.right
new file mode 100644
index 000000000..b0c339db1
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_nested.right
@@ -0,0 +1,14 @@
+var:a
+var:b
+var:c
+var:a
+var:b
+var:c
+Illegal option -d
+var:?
+Illegal option -e
+var:?
+Illegal option -f
+var:?
+var:a
+End: var:? OPTIND:6
diff --git a/shell/ash_test/ash-getopts/getopt_nested.tests b/shell/ash_test/ash-getopts/getopt_nested.tests
new file mode 100755
index 000000000..1b48b4075
--- /dev/null
+++ b/shell/ash_test/ash-getopts/getopt_nested.tests
@@ -0,0 +1,21 @@
+# Test that there is no interference of getopt()
+# in getopts and unset.
+# It's unclear what "correct" OPTIND values should be
+# for "b" and "c" results from "-bc": 2? 3?
+# What we focus on here is that all options are reported
+# correct number of times and in correct sequence.
+
+(
+
+loop=99
+while getopts "abc" var -a -bc -abc -def -a; do
+    echo "var:$var" #OPTIND:$OPTIND
+    # this may use getopt():
+    unset -ff func
+    test $((--loop)) = 0 && break  # BUG if this triggers
+done
+echo "End: var:$var OPTIND:$OPTIND"
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 849fe9e48..ec1b6c429 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -4,12 +4,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-#include "libbb.h"
-
-//applet:IF_CTTYHACK(APPLET_NOEXEC(cttyhack, cttyhack, BB_DIR_BIN, BB_SUID_DROP, cttyhack))
-
-//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
-
 //config:config CTTYHACK
 //config:       bool "cttyhack (2.5 kb)"
 //config:       default y
@@ -54,6 +48,10 @@
 //config:
 //config:       # getty 115200 $(cttyhack)
 
+//applet:IF_CTTYHACK(APPLET_NOEXEC(cttyhack, cttyhack, BB_DIR_BIN, BB_SUID_DROP, cttyhack))
+
+//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
+
 //usage:#define cttyhack_trivial_usage
 //usage:       "[PROG ARGS]"
 //usage:#define cttyhack_full_usage "\n\n"
@@ -65,6 +63,8 @@
 //usage:     "\nStarting interactive shell from boot shell script:"
 //usage:     "\n        setsid cttyhack sh"
 
+#include "libbb.h"
+
 #if !defined(__linux__) && !defined(TIOCGSERIAL) && !ENABLE_WERROR
 # warning cttyhack will not be able to detect a controlling tty on this system
 #endif
diff --git a/shell/hush.c b/shell/hush.c
index cdc3a8618..d27550ba0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -907,6 +907,9 @@ struct globals {
         unsigned depth_break_continue;
         unsigned depth_of_loop;
 #endif
+#if ENABLE_HUSH_GETOPTS
+        unsigned getopt_count;
+#endif
         const char *ifs;
         const char *cwd;
         struct variable *top_var;
@@ -2214,6 +2217,11 @@ static int set_local_var(char *str, unsigned flags)
                 cur->flg_export = 1;
         if (name_len == 4 && cur->varstr[0] == 'P' && cur->varstr[1] == 'S')
                 cmdedit_update_prompt();
+#if ENABLE_HUSH_GETOPTS
+        /* defoptindvar is a "OPTIND=..." constant string */
+        if (strncmp(cur->varstr, defoptindvar, 7) == 0)
+                G.getopt_count = 0;
+#endif
         if (cur->flg_export) {
                 if (flags & SETFLAG_UNEXPORT) {
                         cur->flg_export = 0;
@@ -2244,6 +2252,10 @@ static int unset_local_var_len(const char *name, int name_len)
 
         if (!name)
                 return EXIT_SUCCESS;
+#if ENABLE_HUSH_GETOPTS
+        if (name_len == 6 && strncmp(name, "OPTIND", 6) == 0)
+                G.getopt_count = 0;
+#endif
         var_pp = &G.top_var;
         while ((cur = *var_pp) != NULL) {
                 if (strncmp(cur->varstr, name, name_len) == 0 && cur->varstr[name_len] == '=') {
@@ -9889,7 +9901,8 @@ Test that VAR is a valid variable name?
 */
         char cbuf[2];
         const char *cp, *optstring, *var;
-        int c, exitcode;
+        int c, n, exitcode, my_opterr;
+        unsigned count;
 
         optstring = *++argv;
         if (!optstring || !(var = *++argv)) {
@@ -9897,17 +9910,18 @@ Test that VAR is a valid variable name?
                 return EXIT_FAILURE;
         }
 
-        c = 0;
+        if (argv[1])
+                argv[0] = G.global_argv[0]; /* for error messages in getopt() */
+        else
+                argv = G.global_argv;
+        cbuf[1] = '\0';
+
+        my_opterr = 0;
         if (optstring[0] != ':') {
                 cp = get_local_var_value("OPTERR");
                 /* 0 if "OPTERR=0", 1 otherwise */
-                c = (!cp || NOT_LONE_CHAR(cp, '0'));
+                my_opterr = (!cp || NOT_LONE_CHAR(cp, '0'));
         }
-        opterr = c;
-        cp = get_local_var_value("OPTIND");
-        optind = cp ? atoi(cp) : 0;
-        optarg = NULL;
-        cbuf[1] = '\0';
 
         /* getopts stops on first non-option. Add "+" to force that */
         /*if (optstring[0] != '+')*/ {
@@ -9916,11 +9930,48 @@ Test that VAR is a valid variable name?
                 optstring = s;
         }
 
-        if (argv[1])
-                argv[0] = G.global_argv[0]; /* for error messages */
-        else
-                argv = G.global_argv;
-        c = getopt(string_array_len(argv), argv, optstring);
+        /* Naively, now we should just
+         *      cp = get_local_var_value("OPTIND");
+         *      optind = cp ? atoi(cp) : 0;
+         *      optarg = NULL;
+         *      opterr = my_opterr;
+         *      c = getopt(string_array_len(argv), argv, optstring);
+         * and be done? Not so fast...
+         * Unlike normal getopt() usage in C programs, here
+         * each successive call will (usually) have the same argv[] CONTENTS,
+         * but not the ADDRESSES. Worse yet, it's possible that between
+         * invocations of "getopts", there will be calls to shell builtins
+         * which use getopt() internally. Example:
+         *      while getopts "abc" RES -a -bc -abc de; do
+         *              unset -ff func
+         *      done
+         * This would not work correctly: getopt() call inside "unset"
+         * modifies internal libc state which is tracking position in
+         * multi-option strings ("-abc"). At best, it can skip options
+         * or return the same option infinitely. With glibc implementation
+         * of getopt(), it would use outright invalid pointers and return
+         * garbage even _without_ "unset" mangling internal state.
+         *
+         * We resort to resetting getopt() state and calling it N times,
+         * until we get Nth result (or failure).
+         * (N == G.getopt_count is reset to 0 whenever OPTIND is [un]set).
+         */
+        GETOPT_RESET();
+        count = 0;
+        n = string_array_len(argv);
+        do {
+                optarg = NULL;
+                opterr = (count < G.getopt_count) ? 0 : my_opterr;
+                c = getopt(n, argv, optstring);
+                if (c < 0)
+                        break;
+                count++;
+        } while (count <= G.getopt_count);
+
+        /* Set OPTIND. Prevent resetting of the magic counter! */
+        set_local_var_from_halves("OPTIND", utoa(optind));
+        G.getopt_count = count; /* "next time, give me N+1'th result" */
+        GETOPT_RESET(); /* just in case */
 
         /* Set OPTARG */
         /* Always set or unset, never left as-is, even on exit/error:
@@ -9949,10 +10000,9 @@ Test that VAR is a valid variable name?
                 c = '?';
         }
 
-        /* Set VAR and OPTIND */
+        /* Set VAR */
         cbuf[0] = c;
         set_local_var_from_halves(var, cbuf);
-        set_local_var_from_halves("OPTIND", utoa(optind));
 
         return exitcode;
 }
diff --git a/shell/hush_test/hush-getopts/getopt_nested.right b/shell/hush_test/hush-getopts/getopt_nested.right
new file mode 100644
index 000000000..0218dba56
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_nested.right
@@ -0,0 +1,14 @@
+var:a
+var:b
+var:c
+var:a
+var:b
+var:c
+./getopt_nested.tests: invalid option -- d
+var:?
+./getopt_nested.tests: invalid option -- e
+var:?
+./getopt_nested.tests: invalid option -- f
+var:?
+var:a
+End: var:? OPTIND:6
diff --git a/shell/hush_test/hush-getopts/getopt_nested.tests b/shell/hush_test/hush-getopts/getopt_nested.tests
new file mode 100755
index 000000000..1b48b4075
--- /dev/null
+++ b/shell/hush_test/hush-getopts/getopt_nested.tests
@@ -0,0 +1,21 @@
+# Test that there is no interference of getopt()
+# in getopts and unset.
+# It's unclear what "correct" OPTIND values should be
+# for "b" and "c" results from "-bc": 2? 3?
+# What we focus on here is that all options are reported
+# correct number of times and in correct sequence.
+
+(
+
+loop=99
+while getopts "abc" var -a -bc -abc -def -a; do
+    echo "var:$var" #OPTIND:$OPTIND
+    # this may use getopt():
+    unset -ff func
+    test $((--loop)) = 0 && break  # BUG if this triggers
+done
+echo "End: var:$var OPTIND:$OPTIND"
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/hush_test/hush-vars/unset.tests b/shell/hush_test/hush-vars/unset.tests
index 81243fbf9..268323a6d 100755
--- a/shell/hush_test/hush-vars/unset.tests
+++ b/shell/hush_test/hush-vars/unset.tests
@@ -1,3 +1,5 @@
+(
+
 # check invalid options are rejected
 # bash: in posix mode, aborts if non-interactive
 unset -
@@ -37,3 +39,7 @@ unset VAR_RO
 echo $? $f $g
 unset f VAR_RO g
 echo $? $f $g
+
+) 2>&1 \
+| sed   -e 's/ unrecognized option: / invalid option -- /' \
+        -e 's/ illegal option -- / invalid option -- /' \
diff --git a/shell/shell_common.c b/shell/shell_common.c
index bc34de404..ad9048d89 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -432,8 +432,8 @@ shell_builtin_ulimit(char **argv)
          * ulimit 123 -c2 -l 456
          */
 
-        /* In case getopt was already called:
-         * reset the libc getopt() function, which keeps internal state.
+        /* In case getopt() was already called:
+         * reset libc getopt() internal state.
          */
         GETOPT_RESET();