From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29560 invoked by alias); 19 Aug 2016 16:08:06 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 39070 Received: (qmail 20039 invoked from network); 19 Aug 2016 16:08:06 -0000 X-Qmail-Scanner-Diagnostics: from out2-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.26):SA:0(0.0/5.0):. Processed in 0.170749 secs); 19 Aug 2016 16:08:06 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=Qe3yXi00DrLVpE2Y5lEbS6W6UAI=; b=Tj1ZP4 LFmq+OjbtuIEFjGhq4AVNR9eTkVEeQSjTdzgUEaeJ7VHAFcj0oDByK9ccRk9E8A8 mXLjJLVKLqaaKSCtvVFUuvGqWO3i2eykMxy+XmlFN4mDKbDNB3BcEAt8rzUL36ls ycrY+tGlrjXofVeYlQQI5TJiRSm8akYDVMlnw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=Qe3yXi00DrLVpE2Y5lEbS6W6UAI=; b=YX77R fVtsOKfXVwwJjMChZ33EOEdeqBYz7/GhIV0Pl2SVESA6WatFDOGVP2AbDZpGYt3j xQOedLT6ou+/Mn5Sw7W0qLVRjo5oa5jQVVxIgUxzC/ffSwhR2bJALN7WOEZhZFrS 2twgx7vZCs414aawci2srzTpsKbQGuXTczoLwI= X-Sasl-enc: t/p2JoUmdBUPrDQ2y/8FzGsViiSP8s4paG77GctgfZ2o 1471622218 Date: Fri, 19 Aug 2016 15:56:51 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: umount /f/b =?utf-8?B?4oaS?= /foo/bar Message-ID: <20160819155651.GA9598@fujitsu.shahaf.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.23 (2014-03-12) I'd like «umount /f/b» to complete to «umount /foo/bar». Currently it doesn't, due to _canonical_paths_add_paths() doing its own matching obliviously to matchspecs in effect. I tried to patch this. I got it partly working: with the following patch, «umount /f/b» would honour matchspecs but «umount ../f/b» would not. See the '###' comment within for the point I'm stuck at. Hints? Cheers, Daniel [[[ diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount index a3b58bb..a43085a 100644 --- a/Completion/Unix/Command/_mount +++ b/Completion/Unix/Command/_mount @@ -965,8 +965,8 @@ udevordir) _alternative \ 'device-labels:device label:compadd -a dev_tmp' \ - 'device-paths: device path:_canonical_paths -A dpath_tmp -N device-paths device\ path' \ - 'directories:mount point:_canonical_paths -A mp_tmp -N directories mount\ point' && ret=0 + 'device-paths: device path:_canonical_paths -A dpath_tmp -N -M "r:|/=* r:|=*" device-paths device\ path' \ + 'directories:mount point:_canonical_paths -A mp_tmp -N -M "r:|/=* r:|=*" directories mount\ point' && ret=0 ;; labels) _wanted labels expl 'disk label' compadd /dev/disk/by-label/*(:t) && ret=0 diff --git a/Completion/Unix/Type/_canonical_paths b/Completion/Unix/Type/_canonical_paths index 2fdbaa6..542f418 100644 --- a/Completion/Unix/Type/_canonical_paths +++ b/Completion/Unix/Type/_canonical_paths @@ -59,6 +59,11 @@ _canonical_paths_get_canonical_path() { } _canonical_paths_add_paths () { + # origpref = original prefix + # expref = expanded prefix + # curpref = current prefix + # canpref = canonical prefix + # rltrim = suffix to trim and readd local origpref=$1 expref rltrim curpref canpref subdir [[ $2 != add ]] && matches=() expref=${~origpref} 2>/dev/null @@ -73,13 +78,34 @@ _canonical_paths_add_paths () { [[ $curpref == */ && $canpref == *[^/] ]] && canpref+=/ canpref+=$rltrim [[ $expref == *[^/] && $canpref == */ ]] && origpref+=/ - matches+=(${${(M)files:#$canpref*}/$canpref/$origpref}) + + # Append to $matches the subset of $files that matches $canpref. + if [[ $canpref == $origpref ]]; then + # This codepath honours any -M matchspec parameters. + () { + local -a tmp_buffer + compadd -A tmp_buffer "$__gopts[@]" -a files + matches+=( "${(@)tmp_buffer/$canpref/$origpref}" ) + } + else + # ### Ideally, this codepath would do what the 'if' above does, + # ### but telling compadd to pretend the "word on the command line" + # ### is ${"the word on the command line"/$origpref/$canpref}. + matches+=(${${(M)files:#$canpref*}/$canpref/$origpref}) + fi + for subdir in $expref?*(@); do _canonical_paths_add_paths ${subdir/$expref/$origpref} add done } _canonical_paths() { + # The following parameters are used by callee functions: + # __gopts + # matches + # files + # (possibly others) + local __index typeset -a __gopts __opts ]]]