about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2006-05-30 17:54:26 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2006-05-30 17:54:26 +0000
commit116ee236d1b17025d303bd897ead299b07108919 (patch)
treedebc07f2acbf4141d631f7c85808917a2c2177f7
parentcd821f5f5f95cc4e143ae938e26faf5a78c4cc9c (diff)
downloadzsh-116ee236d1b17025d303bd897ead299b07108919.tar.gz
zsh-116ee236d1b17025d303bd897ead299b07108919.tar.xz
zsh-116ee236d1b17025d303bd897ead299b07108919.zip
22473: tweak bad interpreter formatting
-rw-r--r--ChangeLog5
-rw-r--r--Src/exec.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f9f93cd78..d94f72278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-30  Peter Stephenson  <pws@csr.com>
+
+	* 22473: Src/exec.c: modify zsh-users/10343 to print interpreter
+	using nice characters.  Still not very satisfactory.
+
 2006-05-29  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 22470: configure.ac: incorporate extensions to errno.h
diff --git a/Src/exec.c b/Src/exec.c
index 7efd7d857..cbbc744d7 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -409,9 +409,12 @@ zexecve(char *pth, char **argv)
 			    char *buf;
 			    if (*ptr)
 				*ptr = '\0';
-			    buf = tricat("%s: bad interpreter: ", ptr2,
-					 ": %e");
-			    zerr(buf, pth, eno);
+			    /*
+			     * TODO: needs variable argument handling
+			     * in zerrmsg() etc. to do this properly.
+			     */
+			    buf = dyncat(pth, ": bad interpreter: %s: %e");
+			    zerr(buf, ptr2, eno);
 			} else if (*ptr) {
 			    *ptr = '\0';
 			    argv[-2] = ptr2;