From: Peter Stephenson <pws@csr.com>
To: zsh-workers@sunsite.dk
Subject: Re: _canonical_path not working on *BSD
Date: Thu, 27 Mar 2008 10:23:25 +0000 [thread overview]
Message-ID: <20080327102325.55808716@news01> (raw)
In-Reply-To: <20080326164615.1d5893ed@news01>
On Wed, 26 Mar 2008 16:46:15 +0000
Peter Stephenson <pws@csr.com> wrote:
> +_canonical_paths_get_canonical_path() {
> + typeset newfile
> + typeset -A seen
> +
> + REPLY=$1
> + # Guard against loops.
> + while [[ -z ${seen[$REPLY]} ]]; do
> + seen[$REPLY]=1
> + newfile=$(zstat +link $REPLY 2>/dev/null)
> + if [[ -n $newfile ]]; then
> + REPLY=$newfile
> + else
> + break
> + fi
> + done
> +}
I should make one more point about this before leaving the subject: this
doesn't do everything that "readlink -f" does, in particular it doesn't
remove .. path segments, strip multiple /'s or remove symbolic link
references in intervening directories.
Luckily, we have the technology, I think.
We don't need the $(...) for the zstat. It would be quite nice to
be able to get the directory canonicalization without a fork, too.
Index: Completion/Unix/Type/_canonical_paths
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_canonical_paths,v
retrieving revision 1.2
diff -u -r1.2 _canonical_paths
--- Completion/Unix/Type/_canonical_paths 26 Mar 2008 17:22:25 -0000 1.2
+++ Completion/Unix/Type/_canonical_paths 27 Mar 2008 10:19:10 -0000
@@ -36,20 +36,41 @@
typeset -a matches files
_canonical_paths_get_canonical_path() {
- typeset newfile
+ typeset newfile dir
typeset -A seen
REPLY=$1
- # Guard against loops.
+ # Resolve any trailing symbolic links, guarding against loops.
while [[ -z ${seen[$REPLY]} ]]; do
seen[$REPLY]=1
- newfile=$(zstat +link $REPLY 2>/dev/null)
- if [[ -n $newfile ]]; then
- REPLY=$newfile
+ newfile=()
+ zstat -A newfile +link $REPLY 2>/dev/null
+ if [[ -n $newfile[1] ]]; then
+ REPLY=$newfile[1]
else
break
fi
done
+
+ # Canonicalise the directory path. We may not be able to
+ # do this if we can't read all components.
+ if [[ -d $REPLY ]]; then
+ dir="$(unfunction chpwd
+ setopt CHASE_LINKS
+ cd $REPLY 2>/dev/null && pwd)"
+ if [[ -n $dir ]]; then
+ REPLY=$dir
+ fi
+ elif [[ $REPLY = */*[^/] && $REPLY != /[^/]# ]]; then
+ # Don't try this if there's a trailing slash or we're in
+ # the root directory.
+ dir="$(unfunction chpwd
+ setopt CHASE_LINKS
+ cd ${REPLY%/*} 2>/dev/null && pwd)"
+ if [[ -n $dir ]]; then
+ REPLY=$dir/${REPLY##*/}
+ fi
+ fi
}
next prev parent reply other threads:[~2008-03-27 10:24 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-26 10:44 Baptiste Daroussin
2008-03-26 15:01 ` Debian bugs (Re: _canonical_path not working on *BSD) Bart Schaefer
2008-03-26 15:25 ` Clint Adams
2008-03-26 15:05 ` _canonical_path not working on *BSD Peter Stephenson
2008-03-26 15:27 ` Baptiste Daroussin
2008-03-26 15:34 ` Peter Stephenson
2008-03-26 15:51 ` Pea
2008-03-26 15:59 ` Clint Adams
2008-03-26 15:21 ` Pea
2008-03-26 15:36 ` Bart Schaefer
2008-03-26 15:40 ` Peter Stephenson
2008-03-26 16:04 ` Peter Stephenson
2008-03-26 16:18 ` Bart Schaefer
2008-03-26 16:21 ` Peter Stephenson
2008-03-26 16:38 ` Pea
2008-03-26 16:46 ` Peter Stephenson
2008-03-26 17:08 ` Pea
2008-03-26 17:17 ` Baptiste Daroussin
2008-03-27 10:23 ` Peter Stephenson [this message]
2008-03-27 11:08 ` Pea
2008-03-27 11:25 ` Peter Stephenson
2008-03-27 12:15 ` PATCH: cd -q (was Re: _canonical_path ...) Peter Stephenson
2008-03-27 12:25 ` Stephane Chazelas
2008-03-27 12:35 ` Mikael Magnusson
2008-03-27 12:48 ` Peter Stephenson
2008-03-27 12:56 ` Mikael Magnusson
2008-03-27 18:45 ` Peter Stephenson
2008-03-28 8:16 ` Pea
2008-03-28 11:01 ` Mikael Magnusson
2008-03-28 14:35 ` Peter Stephenson
2008-03-27 12:31 ` _canonical_path not working on *BSD Pea
2008-03-27 15:39 ` Bart Schaefer
2008-03-27 18:06 ` Peter Stephenson
2008-03-28 1:01 ` Bart Schaefer
2008-03-28 7:51 ` Mikael Magnusson
2008-03-28 10:01 ` Peter Stephenson
2008-03-26 16:25 ` Pea
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=20080327102325.55808716@news01 \
--to=pws@csr.com \
--cc=zsh-workers@sunsite.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).