← Commit list

1e5111b0f

Denys Vlasenko
Denys Vlasenko
2018-04-01
SUCCESS Duration: 142s

Subject

ash,hush: handle a few more bkslash-newline cases

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

shell/ash.c +1 -1shell/ash_test/ash-parsing/bkslash_newline1.right +4 -0shell/ash_test/ash-parsing/bkslash_newline1.tests +8 -0shell/ash_test/ash-parsing/bkslash_newline2.right +4 -0shell/ash_test/ash-parsing/bkslash_newline2.tests +4 -0shell/hush.c +12 -2shell/hush_test/hush-parsing/bkslash_newline1.right +4 -0shell/hush_test/hush-parsing/bkslash_newline1.tests +8 -0shell/hush_test/hush-parsing/bkslash_newline2.right +4 -0shell/hush_test/hush-parsing/bkslash_newline2.tests +4 -0
shell/ash.c+1 -1
@@ -12649,7 +12649,7 @@ xxreadtoken(void)
break; /* return readtoken1(...) */
if ((int)(p - xxreadtoken_chars) >= xxreadtoken_singles) {
- int cc = pgetc();
+ int cc = pgetc_eatbnl();
if (cc == c) { /* double occurrence? */
p += xxreadtoken_doubles + 1;
} else {
shell/ash_test/ash-parsing/bkslash_newline1.right+4 -0
@@ -0,0 +1,4 @@
+and1
+and2
+or1
+ok
shell/ash_test/ash-parsing/bkslash_newline1.tests+8 -0
@@ -0,0 +1,8 @@
+echo and1 &\
+& echo and2
+
+echo or1 |\
+| echo NOT SHOWN
+
+case w in a) echo SKIP;\
+; w) echo ok;; esac;
shell/ash_test/ash-parsing/bkslash_newline2.right+4 -0
@@ -0,0 +1,4 @@
+Line with one backslash:
+\
+
+Ok:0
shell/ash_test/ash-parsing/bkslash_newline2.tests+4 -0
@@ -0,0 +1,4 @@
+echo Line with one backslash:
+echo '\
+'
+echo Ok:$?
shell/hush.c+12 -2
@@ -4980,8 +4980,14 @@ static struct pipe *parse_stream(char **pstring,
nommu_addchr(&ctx.as_string, ch);
next = '\0';
- if (ch != '\n')
+ if (ch != '\n') {
next = i_peek(input);
+ /* Can't use i_peek_and_eat_bkslash_nl(input) here:
+ * echo '\
+ * '
+ * will break.
+ */
+ }
is_special = "{}<>;&|()#'" /* special outside of "str" */
"\\$\"" IF_HUSH_TICK("`") /* always special */
@@ -5375,7 +5381,7 @@ static struct pipe *parse_stream(char **pstring,
/* Eat multiple semicolons, detect
* whether it means something special */
while (1) {
- ch = i_peek(input);
+ ch = i_peek_and_eat_bkslash_nl(input);
if (ch != ';')
break;
ch = i_getch(input);
@@ -5397,6 +5403,8 @@ static struct pipe *parse_stream(char **pstring,
if (done_word(&dest, &ctx)) {
goto parse_error;
}
+ if (next == '\\')
+ next = i_peek_and_eat_bkslash_nl(input);
if (next == '&') {
ch = i_getch(input);
nommu_addchr(&ctx.as_string, ch);
@@ -5413,6 +5421,8 @@ static struct pipe *parse_stream(char **pstring,
if (ctx.ctx_res_w == RES_MATCH)
break; /* we are in case's "word | word)" */
#endif
+ if (next == '\\')
+ next = i_peek_and_eat_bkslash_nl(input);
if (next == '|') { /* || */
ch = i_getch(input);
nommu_addchr(&ctx.as_string, ch);
shell/hush_test/hush-parsing/bkslash_newline1.right+4 -0
@@ -0,0 +1,4 @@
+and1
+and2
+or1
+ok
shell/hush_test/hush-parsing/bkslash_newline1.tests+8 -0
@@ -0,0 +1,8 @@
+echo and1 &\
+& echo and2
+
+echo or1 |\
+| echo NOT SHOWN
+
+case w in a) echo SKIP;\
+; w) echo ok;; esac;
shell/hush_test/hush-parsing/bkslash_newline2.right+4 -0
@@ -0,0 +1,4 @@
+Line with one backslash:
+\
+
+Ok:0
shell/hush_test/hush-parsing/bkslash_newline2.tests+4 -0
@@ -0,0 +1,4 @@
+echo Line with one backslash:
+echo '\
+'
+echo Ok:$?