From: "Jun T." <takimoto-j@kba.biglobe.ne.jp>
To: zsh-workers@sunsite.dk
Subject: Re: Bug#482662: zsh: completion with locate gives extra output
Date: Mon, 26 May 2008 19:14:33 +0900 [thread overview]
Message-ID: <a06001073c4603d88044f@kba.biglobe.ne.jp> (raw)
In-Reply-To: <20080525155231.691a4979@pws-pc>
I want take this opportunity to make it support MacOSX.
I believe this will work on (free|Open)BSD as well.
NOTES:
(1) this includes the patch by PWS, which is not yet committed.
(2) I'm not sure if we should 'setopt EXTENDED_GLOB' at the top
of this script. (the globbing flag (#i) requires the option).
(3) I used '_arguments -S' also for mlocate and slocate.
Should it be used also for gnu locate?
(4) '_arguments -A' is used only for bsd locate, since mlocate/slocate
accepts options after pattern(s).
Index: Completion/Unix/Command/_locate
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_locate,v
retrieving revision 1.2
diff -u -r1.2 _locate
--- Completion/Unix/Command/_locate 11 Feb 2008 16:28:30 -0000 1.2
+++ Completion/Unix/Command/_locate 26 May 2008 10:10:49 -0000
@@ -11,7 +11,7 @@
;;
(locate)
- input="$(_call_program locate $words[1] -V)"
+ input="$(_call_program locate $words[1] -V 2>&1)"
case $input in
(*mlocate*)
ltype=mlocate
@@ -21,10 +21,18 @@
ltype=slocate
;;
- (*(#i)gnu locate*)
+ (*(#i)gnu locate*|*findutils*gnu*)
ltype=gnu
;;
+ (*illegal option*)
+ if [[ $OSTYPE == (freebsd|openbsd|dragonfly|darwin)* ]]; then
+ ltype=bsd
+ else
+ ltype=$best_guess
+ fi
+ ;;
+
# guess
(*)
ltype=$best_guess
@@ -43,7 +51,7 @@
# -r/--regexp mean no normal arguments, so shouldn't complete
# -m and --mmap are ignored, so don't bother
# -s and --stdio likewise
- _arguments -s : \
+ _arguments -s -S : \
{-b,--basename}'[Match only the basename of files in the database]' \
{-c,--count}'[Output the number of matching entries]' \
{-d,--database=}'[Use alternative database]:database:_files' \
@@ -67,7 +75,7 @@
# -d can take path
# -e can take a comma-separated list of directories.
# -f should complete list of file system types like mount
- _arguments -s : \
+ _arguments -s -S : \
-u'[Create slocate database starting at path /]' \
-U'[Create slocate database starting at given path]:directory:_files -/' \
-c'[Parse GNU locate updatedb with -u, -U]' \
@@ -108,4 +116,17 @@
--help'[Show help]' \
'*:pattern: '
;;
+
+ (bsd)
+ _arguments -s -S -A '-*' \
+ '(-S)-0[Separate file names by NUL characters]' \
+ '(- *)-S[Show database statistics and exit]' \
+ '(-S)-c[Output the number of matching file names]' \
+ '(-S)*-d[Specify database to search]:database:_files' \
+ '(-S)-i[Ignore case distinctions in pattern and database]' \
+ '(-S)-l[Limit output to specified number of file names]:file limit: ' \
+ '(-S)-m[Use mmap(2) instead of stdio(3) (default)]' \
+ '(-S)-s[Use stdio(3) instead of mmap(2)]' \
+ '*:pattern: '
+ ;;
esac
next prev parent reply other threads:[~2008-05-26 10:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080524095358.26811.79795.reportbug@nexus>
[not found] ` <20080524135404.GA9888@scru.org>
[not found] ` <20080524164656.GA2682@nexus>
2008-05-24 20:21 ` Clint Adams
2008-05-25 14:52 ` Peter Stephenson
2008-05-26 10:14 ` Jun T. [this message]
2008-05-26 13:39 ` Peter Stephenson
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=a06001073c4603d88044f@kba.biglobe.ne.jp \
--to=takimoto-j@kba.biglobe.ne.jp \
--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).