← Commit list

41fddb437

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

Subject

parser: Fix backquote support in here-document EOF mark

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 +6 -0shell/ash_test/ash-heredoc/heredoc_backquote1.right +5 -0shell/ash_test/ash-heredoc/heredoc_backquote1.tests +10 -0shell/hush_test/hush-heredoc/heredoc_backquote1.right +5 -0shell/hush_test/hush-heredoc/heredoc_backquote1.tests +10 -0
shell/ash.c+6 -0
@@ -12093,6 +12093,12 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
break;
#endif
case CBQUOTE: /* '`' */
+ if (checkkwd & CHKEOFMARK) {
+ quotef = 1;
+ USTPUTC('`', out);
+ break;
+ }
+
PARSEBACKQOLD();
break;
case CENDFILE:
shell/ash_test/ash-heredoc/heredoc_backquote1.right+5 -0
@@ -0,0 +1,5 @@
+heredoc1
+Ok1:0
+heredoc2
+EO`false`F
+Ok2:0
shell/ash_test/ash-heredoc/heredoc_backquote1.tests+10 -0
@@ -0,0 +1,10 @@
+cat <<EO`true`F
+heredoc1
+EO`true`F
+echo Ok1:$?
+
+cat <<EO`true`F
+heredoc2
+EO`false`F
+EO`true`F
+echo Ok2:$?
shell/hush_test/hush-heredoc/heredoc_backquote1.right+5 -0
@@ -0,0 +1,5 @@
+heredoc1
+Ok1:0
+heredoc2
+EO`false`F
+Ok2:0
shell/hush_test/hush-heredoc/heredoc_backquote1.tests+10 -0
@@ -0,0 +1,10 @@
+cat <<EO`true`F
+heredoc1
+EO`true`F
+echo Ok1:$?
+
+cat <<EO`true`F
+heredoc2
+EO`false`F
+EO`true`F
+echo Ok2:$?