From: Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
To: zsh-workers@sunsite.auc.dk
Subject: RE: PATCH: Re: pws-10 RE: zsh-3.1.5-pws-9: _path_files and symbolic links
Date: Mon, 1 Mar 1999 15:45:53 +0100 (MET) [thread overview]
Message-ID: <199903011445.PAA15418@beta.informatik.hu-berlin.de> (raw)
In-Reply-To: "Andrej Borsenkow"'s message of Mon, 1 Mar 1999 17:26:14 +0300
Andrej Borsenkow wrote:
> > The question is what one can find under `/u/'. If there is anything
> > matching `l/l/T' the behavior might be correct (since it can't expand
> > `u' to `usr' then).
>
> Nope. It is the problem of exact match. ``/u'' is matched _exactly_ and
> hence ``/usr'' is never even tried.
Ah, tricky. The patch below makes path components be left unchanged
only if the rest of the string would produce a match below that
directory.
Bye
Sven
diff -u oc/Core/_path_files Completion/Core/_path_files
--- oc/Core/_path_files Mon Mar 1 14:32:16 1999
+++ Completion/Core/_path_files Mon Mar 1 15:45:51 1999
@@ -170,23 +170,26 @@
fi
fi
-# First we skip over all pathname components in `str' which really exist in
-# the file-system, so that `/usr/lib/l<TAB>' doesn't offer you `lib' and
-# `lib5'. Pathname components skipped this way are taken from `str' and added
-# to `donepath'.
-
-while [[ "$str" = */* ]] do
- [[ -e "$realpath$donepath${str%%/*}" ]] || break
- donepath="$donepath${str%%/*}/"
- str="${str#*/}"
-done
-
+# Save the original string.
orig="${str:s/*//}"
# Now build the glob pattern by calling `_match_pattern'.
patstr="$str"
matchflags=""
_match_pattern _path_files patstr matchflags
+
+# First we skip over all pathname components in `str' which really exist in
+# the file-system, so that `/usr/lib/l<TAB>' doesn't offer you `lib' and
+# `lib5'. Pathname components skipped this way are taken from `orig' and added
+# to `donepath'.
+
+while [[ "$orig" = */* ]] do
+ tmp1=($realpath$donepath${orig%%/*}/${~patstr#*/})
+ [[ $#tmp1 -gt 0 && -e "$realpath$donepath${orig%%/*}" ]] || break
+ donepath="$donepath${orig%%/*}/"
+ orig="${orig#*/}"
+ patstr="${patstr#*/}"
+done
# We almost expect the pattern to have changed `..' into `*.*.', `/.' into
# `/*.', and probably to contain two or more consecutive `*'s. Since these
--
Sven Wischnowsky wischnow@informatik.hu-berlin.de
next reply other threads:[~1999-03-01 14:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-03-01 14:45 Sven Wischnowsky [this message]
1999-03-04 17:38 ` Shuld it be so? " Andrej Borsenkow
-- strict thread matches above, loose matches on Subject: below --
1999-03-01 15:46 Sven Wischnowsky
1999-03-01 13:45 Sven Wischnowsky
1999-03-01 14:46 ` Peter Stephenson
1999-03-01 13:39 Sven Wischnowsky
1999-03-01 13:03 Sven Wischnowsky
1999-03-01 13:24 ` Andrej Borsenkow
1999-03-01 14:26 ` Andrej Borsenkow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=199903011445.PAA15418@beta.informatik.hu-berlin.de \
--to=wischnow@informatik.hu-berlin.de \
--cc=zsh-workers@sunsite.auc.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).