Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: _path_files prefix handling



Peter Stephenson wrote:
> 1. At the least we could test [[ -d pathcomponent ]] at each stage and
> trust the system to get this right, rather than rely on pathcomponent
> appearing in the list of entries in the current directory.  This ought
> to be relatively simple, and I think fixes all the problems I know about
> --- this test works for all components of /cygdrive/c/Program\ Files
> under Cygwin, for example, making half of `fake's properties redundant
> (you still need it to be offered the choice, but don't need it for the
> system to recognise that the choice is a valid path component).

Here's an attempt which seems to do more or less the right thing with
Cygwin and ClearCase without fake-files.  I'm not claiming this is The
Right Way To Do It.  I have tried it with a filename with a space in,
however.

Index: Completion/Unix/Type/_path_files
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_path_files,v
retrieving revision 1.20
diff -u -r1.20 _path_files
--- Completion/Unix/Type/_path_files	6 Nov 2002 08:03:44 -0000	1.20
+++ Completion/Unix/Type/_path_files	12 Feb 2003 15:05:06 -0000
@@ -343,6 +343,22 @@
     if [[ -n "$PREFIX$SUFFIX" ]]; then
       # See which of them match what's on the line.
 
+      # pws non-canonical hack which seems to work so far...
+      # if we didn't match by globbing, check that there is
+      # something to match by explicit name.  This is for
+      # `clever' filing systems where names pop into existence
+      # when referenced.
+      if (( ! $#tmp1 )); then
+	  for tmp3 in "$tmp2[@]"; do
+	      if [[ -n $tmp3 && $tmp3 != */ ]]; then
+		  tmp3+=/
+	      fi
+	      if [[ -e "$tmp3${(Q)PREFIX}${(Q)SUFFIX}" ]] then
+		  tmp1+=("$tmp3${(Q)PREFIX}${(Q)SUFFIX}")
+	      fi
+	  done
+      fi
+
       if (( ! $#tmp1 )); then
         tmp2=( ${^tmp2}/$PREFIX$SUFFIX )
       elif [[ "$tmp1[1]" = */* ]]; then


-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 692070


**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential 
and/or privileged material. 
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by 
persons or entities other than the intended recipient is 
prohibited.  
If you received this in error, please contact the sender and 
delete the material from any computer.
**********************************************************************



Messages sorted by: Reverse Date, Date, Thread, Author