1 files changed, 3 insertions, 43 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;
-        struct jmploc jmploc;
-        struct jmploc *volatile savehandler;
+        char *str;
         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 */
 
 /*