summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-10-14 21:47:52 +0000
committerClint Adams <clint@users.sourceforge.net>2008-10-14 21:47:52 +0000
commitb26cb5f98acf2d2b2f83e8aceca0eb4f82d941c0 (patch)
tree18b49fa3c7e2f0dc459238b32410fa0fafed03cb
parent9b3a41d5297ca636f2de95bbc49ce1efa2e2ebb4 (diff)
downloadzsh-b26cb5f98acf2d2b2f83e8aceca0eb4f82d941c0.tar.gz
zsh-b26cb5f98acf2d2b2f83e8aceca0eb4f82d941c0.tar.xz
zsh-b26cb5f98acf2d2b2f83e8aceca0eb4f82d941c0.zip
25896: remove small bit of dead code in execbuiltin.
-rw-r--r--ChangeLog3
-rw-r--r--Src/builtin.c5
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5508e834d..52959a04a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-14  Clint Adams  <clint@zsh.org>
 
+	* 25896: Src/builtin.c: remove small bit of dead code in
+	execbuiltin.
+
 	* Jörg Sommer: 25882: Completion/Unix/Command/_ssh: run ssh with
 	-oBatchMode=yes.
 
diff --git a/Src/builtin.c b/Src/builtin.c
index c4f6c3172..e852092e2 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -313,10 +313,7 @@ execbuiltin(LinkList args, Builtin bn)
 		*/
 		if (flags & BINF_SKIPINVALID) {
 		    char *p = arg;
-		    if (optstr)
-			while (*++p && strchr(optstr, (int) *p));
-		    else
-			p++;
+		    while (*++p && strchr(optstr, (int) *p));
 		    if (*p)
 			break;
 		}