summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Src/Zle/compctl.c7
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 511271ea2..82630e530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-27 Peter Stephenson <pws@csr.com>
+
+ * 23337: Src/Zle/compctl.c: argument to stat() wasn't
+ unmetafied so some filenames with non-ASCII characters
+ weren't recognised when the type of the file needed testing
+ in old-fashioned completion.
+
2007-04-26 Peter Stephenson <pws@csr.com>
* Phil Pennock: 23326: Src/utils.c: with no __STDC_ISO_10646__
diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c
index 17c8083f0..81f11b423 100644
--- a/Src/Zle/compctl.c
+++ b/Src/Zle/compctl.c
@@ -2188,9 +2188,14 @@ gen_matches_files(int dirs, int execs, int all)
if (!test)
continue;
if (!all) {
+ char *ums;
+ int umlen;
/* We still have to check the file type, so prepare *
* the path buffer by appending the filename. */
- strcpy(q, n);
+ ums = dupstring(n);
+ unmetafy(ums, &umlen);
+ memcpy(q, ums, umlen);
+ q[umlen] = '\0';
/* And do the stat. */
if (stat(p, &buf) < 0)
continue;