diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/parser.c | 38 |
2 files changed, 4 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog index 5dd6d40..6295fe9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2006-03-29 Herbert Xu <herbert@gondor.apana.org.au> * Removed useless parsebackquote flag. + * Use alloca to get rid of setjmp in parse.c. 2006-01-12 Herbert Xu <herbert@gondor.apana.org.au> diff --git a/src/parser.c b/src/parser.c index 375fd54..4362f6a 100644 --- a/src/parser.c +++ b/src/parser.c @@ -32,6 +32,7 @@ * SUCH DAMAGE. */ +#include <alloca.h> #include <stdlib.h> #include "shell.h" @@ -846,19 +847,6 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) int dqvarnest; /* levels of variables expansion within double quotes */ int oldstyle; char const *prevsyntax; /* syntax before arithmetic */ -#if __GNUC__ - /* Avoid longjmp clobbering */ - (void) &out; - (void) "ef; - (void) &dblquote; - (void) &varnest; - (void) &arinest; - (void) &parenlevel; - (void) &dqvarnest; - (void) &oldstyle; - (void) &prevsyntax; - (void) &syntax; -#endif startlinno = plinno; dblquote = 0; @@ -1263,31 +1251,16 @@ badsub: synerror("Bad substitution"); parsebackq: { struct nodelist **nlpp; union node *n; - char *volatile str; - struct jmploc jmploc; - struct jmploc *volatile savehandler; + char *str; size_t savelen; int saveprompt; -#ifdef __GNUC__ - (void) &saveprompt; -#endif - if (setjmp(jmploc.loc)) { - if (str) - ckfree(str); - handler = savehandler; - longjmp(handler->loc, 1); - } - INTOFF; str = NULL; savelen = out - (char *)stackblock(); if (savelen > 0) { - str = ckmalloc(savelen); + str = alloca(savelen); memcpy(str, stackblock(), savelen); } - savehandler = handler; - handler = &jmploc; - INTON; if (oldstyle) { /* We must read until the closing backquote, giving special treatment to some slashes, and then push the string and @@ -1386,12 +1359,7 @@ done: if (str) { memcpy(out, str, savelen); STADJUST(savelen, out); - INTOFF; - ckfree(str); - str = NULL; - INTON; } - handler = savehandler; if (arinest || dblquote) USTPUTC(CTLBACKQ | CTLQUOTE, out); else |