summary refs log tree commit diff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-09-24 21:53:49 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2007-09-24 22:01:26 +0800
commit1a7484507d3195e3d349a4506dd7f908024df7e5 (patch)
tree6d13ff70d393e79123a5b85aa1fb15f4c50e17c2
parent[EXPAND] Perform tilde expansion in all parameter expansion words (diff)
downloaddash-1a7484507d3195e3d349a4506dd7f908024df7e5.tar.gz
dash-1a7484507d3195e3d349a4506dd7f908024df7e5.zip
[PARSER] Remove superfluous arinest test in CENDQUOTE
If arinest is set then the syntax must be ARISYNTAX.  As such CENDQUOTE can
never occur while arinest is set so we don't need to test for it.
-rw-r--r--ChangeLog1
-rw-r--r--src/parser.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 816f56d..0a35741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Do not quote back slashes in parameter expansions outside quotes.
 	* Perform tilde expansion in all parameter expansion words.
+	* Remove superfluous arinest test in CENDQUOTE.
 
 2007-09-22  Oleg Verych <olecom@flower.upol.cz>
 
diff --git a/src/parser.c b/src/parser.c
index 279d49e..26c9046 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -932,10 +932,9 @@ quotemark:
 				dblquote = 1;
 				goto quotemark;
 			case CENDQUOTE:
-				if (eofmark != NULL && arinest == 0 &&
-				    varnest == 0) {
+				if (eofmark && !varnest)
 					USTPUTC(c, out);
-				} else {
+				else {
 					if (dqvarnest == 0) {
 						syntax = BASESYNTAX;
 						dblquote = 0;