From f8d01d3f66dc50e54dae3c1d0e9b249f71f1dd43 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 14 Jun 2008 17:13:20 +0000
Subject: hush: fix a bug where we were requiring semicolon here: (cmd;)  also
 fix a bug where after error prompt is not shown.

function                                             old     new   delta
parse_stream                                        1612    1638     +26
parse_and_run_stream                                 361     375     +14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 40/0)               Total: 40 bytes
---
 shell/hush_test/hush-bugs/while_in_subshell.right | 1 -
 shell/hush_test/hush-bugs/while_in_subshell.tests | 2 --
 shell/hush_test/hush-misc/colon.tests             | 3 +--
 shell/hush_test/hush-misc/while_in_subshell.right | 1 +
 shell/hush_test/hush-misc/while_in_subshell.tests | 2 ++
 5 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 shell/hush_test/hush-bugs/while_in_subshell.right
 delete mode 100755 shell/hush_test/hush-bugs/while_in_subshell.tests
 create mode 100644 shell/hush_test/hush-misc/while_in_subshell.right
 create mode 100755 shell/hush_test/hush-misc/while_in_subshell.tests

(limited to 'shell/hush_test')

diff --git a/shell/hush_test/hush-bugs/while_in_subshell.right b/shell/hush_test/hush-bugs/while_in_subshell.right
deleted file mode 100644
index 290d39b7e..000000000
--- a/shell/hush_test/hush-bugs/while_in_subshell.right
+++ /dev/null
@@ -1 +0,0 @@
-OK: 0
diff --git a/shell/hush_test/hush-bugs/while_in_subshell.tests b/shell/hush_test/hush-bugs/while_in_subshell.tests
deleted file mode 100755
index def8e092b..000000000
--- a/shell/hush_test/hush-bugs/while_in_subshell.tests
+++ /dev/null
@@ -1,2 +0,0 @@
-(while true; do exit; done)
-echo OK: $?
diff --git a/shell/hush_test/hush-misc/colon.tests b/shell/hush_test/hush-misc/colon.tests
index ea3b4d5f3..cb8ab5306 100755
--- a/shell/hush_test/hush-misc/colon.tests
+++ b/shell/hush_test/hush-misc/colon.tests
@@ -1,6 +1,5 @@
 false
 :
 echo $?
-# Extra ; after done is due to a bug
-(while :; do exit; done;)
+(while :; do exit; done)
 echo OK: $?
diff --git a/shell/hush_test/hush-misc/while_in_subshell.right b/shell/hush_test/hush-misc/while_in_subshell.right
new file mode 100644
index 000000000..290d39b7e
--- /dev/null
+++ b/shell/hush_test/hush-misc/while_in_subshell.right
@@ -0,0 +1 @@
+OK: 0
diff --git a/shell/hush_test/hush-misc/while_in_subshell.tests b/shell/hush_test/hush-misc/while_in_subshell.tests
new file mode 100755
index 000000000..def8e092b
--- /dev/null
+++ b/shell/hush_test/hush-misc/while_in_subshell.tests
@@ -0,0 +1,2 @@
+(while true; do exit; done)
+echo OK: $?
-- 
cgit v1.2.3