summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/compcore.c9
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e28c4fb91..e4a34b2a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-16 Clint Adams <clint@zsh.org>
+
+ * 21631: Src/Zle/compcore.c: make sure an unmetafied string is
+ passed to ztat to determine file type.
+
2005-08-15 Andrey Borzenkov <bor@zsh.org>
* 21622: Src/Zle/zle_refresh.c: metafy line back before calling
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index 3a86eb793..66a673dcd 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -2484,16 +2484,23 @@ add_match_data(int alt, char *str, char *orig, Cline line,
if ((flags & CMF_FILE) && orig[0] && orig[strlen(orig) - 1] != '/') {
struct stat buf;
char *pb;
+ int blahl;
pb = (char *) zhalloc((cm->prpre ? strlen(cm->prpre) : 0) +
3 + strlen(orig));
sprintf(pb, "%s%s", (cm->prpre ? cm->prpre : "./"), orig);
- if (!ztat(pb, &buf, 1)) {
+ char *blah = ztrdup(pb);
+
+ unmetafy(blah, &blahl);
+
+ if (!ztat(blah, &buf, 1)) {
cm->mode = buf.st_mode;
if ((cm->modec = file_type(buf.st_mode)) == ' ')
cm->modec = '\0';
}
+
+ free(blah);
}
if ((*compqstack == '\\' && compqstack[1]) ||
(autoq && *compqstack && compqstack[1] == '\\'))