summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2006-10-19 08:40:58 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2006-10-19 08:40:58 +0000
commit7d75ea056b9a70bab13c36cdca1e04abef7da808 (patch)
tree96ca41f519de09419ecc64b860df3ceb4366dfb4 /Src
parentd3fe55f08b04ba66278bd16ce261c6df0eebfaa2 (diff)
downloadzsh-7d75ea056b9a70bab13c36cdca1e04abef7da808.tar.gz
zsh-7d75ea056b9a70bab13c36cdca1e04abef7da808.tar.xz
zsh-7d75ea056b9a70bab13c36cdca1e04abef7da808.zip
22885: fix problems with multibyte tokenized strings
unposted: _todo.sh: more contexts
Diffstat (limited to 'Src')
-rw-r--r--Src/utils.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/Src/utils.c b/Src/utils.c
index 2e124443f..3658e615f 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -4003,6 +4003,21 @@ mb_metacharlenconv(const char *s, wint_t *wcp)
 	    *wcp = (wint_t)(*s == Meta ? s[1] ^ 32 : *s);
 	return 1 + (*s == Meta);
     }
+    /*
+     * We have to handle tokens here, since we may be looking
+     * through a tokenized input.  Obviously this isn't
+     * a valid multibyte character, so just return WEOF
+     * and let the caller handle it as a single character.
+     *
+     * TODO: I've a sneaking suspicion we could do more here
+     * to prevent the caller always needing to handle invalid
+     * characters specially, but sometimes it may need to know.
+     */
+    if (itok(*s)) {
+	if (wcp)
+	    *wcp = EOF;
+	return 1;
+    }
 
     ret = MB_INVALID;
     for (ptr = s; *ptr; ) {