Merge branch 'busybox' into merge

author: Ron Yorston <rmy@pobox.com> 2015-07-14 14:12:05 +0100
committer: Ron Yorston <rmy@pobox.com> 2015-07-14 14:12:05 +0100
commit: 895a1533781ca4713ef92113ab6ac5f2584ddd9d (patch)
tree: 49c8602e9cd733e6f6c105e94e614b8236677853 /shell
parent: 535ec990c50206697852d5c25e94a959f24d86bc (diff)
parent: 072fc60f29ee3a4ff38f095a9ef149b2e820c8c0 (diff)
download: busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.gz
busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.bz2
busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.zip
6 files changed, 6 insertions, 46 deletions
diff --git a/shell/ash.c b/shell/ash.c
index c5b9741d6..ef3f7933a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9888,7 +9888,6 @@ evalcommand(union node *cmd, int flags)
                if (evalfun(cmdentry.u.func, argc, argv, flags))
                        goto raise;
                break;
        } /* switch */
 out:
@@ -10917,7 +10916,6 @@ struct heredoc {
 };
 static smallint tokpushback;           /* last token pushed back */
-static smallint parsebackquote;        /* nonzero if we are inside backquotes */
 static smallint quoteflag;             /* set if (part of) last token was quoted */
 static token_id_t lasttoken;           /* last token read (integer id Txxx) */
 static struct heredoc *heredoclist;    /* list of here documents to read */
@@ -11577,19 +11575,6 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
        IF_ASH_BASH_COMPAT(smallint bash_dollar_squote = 0;)
-#if __GNUC__
-        /* Avoid longjmp clobbering */
-        (void) &out;
-        (void) &quotef;
-        (void) &dblquote;
-        (void) &varnest;
-        (void) &arinest;
-        (void) &parenlevel;
-        (void) &dqvarnest;
-        (void) &oldstyle;
-        (void) &prevsyntax;
-        (void) &syntax;
-#endif
        startlinno = g_parsefile->linno;
        bqlist = NULL;
        quotef = 0;
@@ -11757,7 +11742,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
        if (syntax == ARISYNTAX)
                raise_error_syntax("missing '))'");
 #endif
-        if (syntax != BASESYNTAX && !parsebackquote && eofmark == NULL)
+        if (syntax != BASESYNTAX && eofmark == NULL)
                raise_error_syntax("unterminated quoted string");
        if (varnest != 0) {
                startlinno = g_parsefile->linno;
@@ -12053,34 +12038,17 @@ parsesub: {
 */
 parsebackq: {
        struct nodelist **nlpp;
-        smallint savepbq;
        union node *n;
-        char *volatile str;
+        char *str;
-        struct jmploc jmploc;
-        struct jmploc *volatile savehandler;
        size_t savelen;
        smallint saveprompt = 0;
-#ifdef __GNUC__
-        (void) &saveprompt;
-#endif
-        savepbq = parsebackquote;
-        if (setjmp(jmploc.loc)) {
-                free(str);
-                parsebackquote = 0;
-                exception_handler = savehandler;
-                longjmp(exception_handler->loc, 1);
-        }
-        INT_OFF;
        str = NULL;
        savelen = out - (char *)stackblock();
        if (savelen > 0) {
-                str = ckmalloc(savelen);
+                str = alloca(savelen);
                memcpy(str, stackblock(), savelen);
        }
-        savehandler = exception_handler;
-        exception_handler = &jmploc;
-        INT_ON;
        if (oldstyle) {
                /* We must read until the closing backquote, giving special
                 * treatment to some slashes, and then push the string and
@@ -12151,7 +12119,6 @@ parsebackq: {
                nlpp = &(*nlpp)->next;
        *nlpp = stzalloc(sizeof(**nlpp));
        /* (*nlpp)->next = NULL; - stzalloc did it */
-        parsebackquote = oldstyle;
        if (oldstyle) {
                saveprompt = doprompt;
@@ -12180,13 +12147,7 @@ parsebackq: {
        if (str) {
                memcpy(out, str, savelen);
                STADJUST(savelen, out);
-                INT_OFF;
-                free(str);
-                str = NULL;
-                INT_ON;
        }
-        parsebackquote = savepbq;
-        exception_handler = savehandler;
        USTPUTC(CTLBACKQ, out);
        if (oldstyle)
                goto parsebackq_oldreturn;
@@ -12206,7 +12167,6 @@ parsearith: {
        goto parsearith_return;
 }
 #endif
 } /* end of readtoken */
 /*
diff --git a/shell/ash_test/ash-misc/echo_write_error.tests b/shell/ash_test/ash-misc/echo_write_error.tests
index 0a40c9ff7..0a40c9ff7 100644..100755
--- a/shell/ash_test/ash-misc/echo_write_error.tests
+++ b/shell/ash_test/ash-misc/echo_write_error.tests
diff --git a/shell/ash_test/ash-misc/tickquote1.right b/shell/ash_test/ash-misc/tickquote1.right
new file mode 100644
index 000000000..2e661bfe3
--- /dev/null
+++ b/shell/ash_test/ash-misc/tickquote1.right
@@ -0,0 +1 @@
+./tickquote1.tests: line 1: syntax error: unterminated quoted string
diff --git a/shell/ash_test/ash-misc/tickquote1.tests b/shell/ash_test/ash-misc/tickquote1.tests
new file mode 100755
index 000000000..90d5bbc9b
--- /dev/null
+++ b/shell/ash_test/ash-misc/tickquote1.tests
@@ -0,0 +1 @@
+echo `"pwd`
diff --git a/shell/hush.c b/shell/hush.c
index f2c0a70f2..3ca04494c 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -442,7 +442,7 @@ enum {
        MAYBE_ASSIGNMENT      = 0,
        DEFINITELY_ASSIGNMENT = 1,
        NOT_ASSIGNMENT        = 2,
-        /* Not an assigment, but next word may be: "if v=xyz cmd;" */
+        /* Not an assignment, but next word may be: "if v=xyz cmd;" */
        WORD_IS_KEYWORD       = 3,
 };
 /* Used for initialization: o_string foo = NULL_O_STRING; */
@@ -5390,7 +5390,6 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg)
                                                !!(output->o_expflags & EXP_FLAG_ESC_GLOB_CHARS));
                        }
                        break;
                } /* switch (char after <SPECIAL_VAR_SYMBOL>) */
                if (val && val[0]) {
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 2244a3c97..1567d1de4 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -500,7 +500,6 @@ shell_builtin_ulimit(char **argv)
                        /* bad option. getopt already complained. */
                        break;
                }
        } /* while (there are options) */
        return 0;
author	Ron Yorston <rmy@pobox.com>	2015-07-14 14:12:05 +0100
committer	Ron Yorston <rmy@pobox.com>	2015-07-14 14:12:05 +0100
commit	895a1533781ca4713ef92113ab6ac5f2584ddd9d (patch)
tree	49c8602e9cd733e6f6c105e94e614b8236677853 /shell
parent	535ec990c50206697852d5c25e94a959f24d86bc (diff)
parent	072fc60f29ee3a4ff38f095a9ef149b2e820c8c0 (diff)
download	busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.gz busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.bz2 busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.zip