Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: bug in completion/expansion of files with LANG=C
- X-seq: zsh-workers 22149
- From: Wayne Davison <wayned@xxxxxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxxxxx
- Subject: Re: bug in completion/expansion of files with LANG=C
- Date: Sun, 8 Jan 2006 17:42:57 -0800
- In-reply-to: <20060106215829.GG10111@xxxxxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <20060106215829.GG10111@xxxxxxxxxxxxx>
I looked around at the other calls to mbrtowc() in the code, and cleaned
up a few things:
1. I made all the code assign the return value to a size_t, not an int.
This should prevent a failure on a system where the size of an int is
larger than the size of a size_t (since the (size_t)-1 and (size_t)-2
values won't get converted into negative numbers if that is the case).
2. I added STOUC() around a couple char args that were getting passed to
nicechar() when mbrtowc() failed.
3. One of the calls needed to reset the mbstate_t object when continuing
to parse the string after mbrtowc() failed.
4. The code in sub_match() (in Src/Zle/compmatch.c) had a bug when it
assembled a wide-char value from multiple bytes (decoded from a metafied
string): the code was not advancing past all the raw values used if
there was a meta char or a multibyte character sequence (and I think a
'\0' byte might have even looped infinitely).
After doing all that, it was time to begin looking at the next stage of
the non-inputable-filename problem: I decided to do the easiest possible
change first, so attached is a patch that causes zsh to insert a literal
question-mark in place of each errant character. This allows me to at
least match a name that cannot be input into the command-line, but it
could be a little dangerous if it happens to match other filenames too,
so this is probably not something we'd want to use in an actual release.
..wayne..
--- Src/Zle/zle_utils.c 9 Jan 2006 00:29:57 -0000 1.34
+++ Src/Zle/zle_utils.c 9 Jan 2006 01:20:35 -0000
@@ -277,13 +277,13 @@ stringaszleline(char *instr, int incs, i
while (ll > 0) {
size_t ret = mbrtowc(outptr, inptr, ll, &ps);
- /*
- * At this point we don't handle either incomplete (-2) or
- * invalid (-1) multibyte sequences. Use the current length
- * and return.
- */
- if (ret == (size_t)-1 || ret == (size_t)-2)
- break;
+ if (ret == (size_t)-1 || ret == (size_t)-2) {
+ /* Transform invalid character sequences into literal
+ * question marks, at least for now... */
+ *outptr = L'?';
+ ret = 1;
+ memset(&ps, '\0', sizeof ps);
+ }
/*
* Careful: converting a wide NUL returns zero, but we
Messages sorted by:
Reverse Date,
Date,
Thread,
Author