emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: correct exitcode for unterminated ')' - exitcode2.tests testcase

Browse Source 
function                                             old     new   delta
parse_stream                                        2595    2609     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-01-03 11:47:50 +01:00
parent ea7d2f6ec0
commit b05bcaf29c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell/hush.c
View File

@ -1137,6 +1137,9 @@ static void syntax_error_unexpected_ch(unsigned lineno UNUSED_PARAM, int ch)
char msg[2]; char msg[2];
msg[0] = ch; msg[0] = ch;
msg[1] = '\0'; msg[1] = '\0';
#if HUSH_DEBUG >= 2
bb_error_msg("hush.c:%u", lineno);
#endif
bb_error_msg("syntax error: unexpected %s", ch == EOF ? "EOF" : msg); bb_error_msg("syntax error: unexpected %s", ch == EOF ? "EOF" : msg);
} }
@ -4997,7 +5000,8 @@ static struct pipe *parse_stream(char **pstring,
* if we see {, we call parse_group(..., end_trigger='}') * if we see {, we call parse_group(..., end_trigger='}')
* and it will match } earlier (not here). */ * and it will match } earlier (not here). */
syntax_error_unexpected_ch(ch); syntax_error_unexpected_ch(ch);
goto parse_error; G.last_exitcode = 2;
goto parse_error1;
default: default:
if (HUSH_DEBUG) if (HUSH_DEBUG)
bb_error_msg_and_die("BUG: unexpected %c\n", ch); bb_error_msg_and_die("BUG: unexpected %c\n", ch);
@ -5005,6 +5009,8 @@ static struct pipe *parse_stream(char **pstring,
} /* while (1) */ } /* while (1) */
parse_error: parse_error:
G.last_exitcode = 1;
parse_error1:
{ {
struct parse_context *pctx; struct parse_context *pctx;
IF_HAS_KEYWORDS(struct parse_context *p2;) IF_HAS_KEYWORDS(struct parse_context *p2;)
@ -5038,7 +5044,6 @@ static struct pipe *parse_stream(char **pstring,
} while (HAS_KEYWORDS && pctx); } while (HAS_KEYWORDS && pctx);
o_free(&dest); o_free(&dest);
G.last_exitcode = 1;
#if !BB_MMU #if !BB_MMU
if (pstring) if (pstring)
*pstring = NULL; *pstring = NULL;