From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20483 invoked by alias); 9 Mar 2017 05:55:14 -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: 40801 Received: (qmail 8211 invoked from network); 9 Mar 2017 05:55:14 -0000 X-Qmail-Scanner-Diagnostics: from mail-ua0-f194.google.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(209.85.217.194):SA:0(0.5/5.0):. Processed in 2.007185 secs); 09 Mar 2017 05:55:14 -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.5 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_SPAM,SPF_PASS, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: schaefer@brasslantern.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.217.194 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20150623.gappssmtp.com; s=20150623; h=from:message-id:date:in-reply-to:comments:references:to:subject :mime-version; bh=Zl7OmZH6PQZnVjSGkVnp+5YLguxS4HYXkbwZx+QEHEs=; b=Qmwicq1/xmEIZoefezHB3fQG3WUQSm1vAqLr+w/j21xNnzm1Irm2uQO0H0fyRpRifD JWI4n+Uv92Knksvx64FZ1ncWhz5aSUeuL0/dwbEO8rL7Lwfbig4/WJFvApxRD4+E1Fcf 4LCKP9JwzL7fK0I0c4YNqvnkyUuowAH0vQ64l2+WjHbwkBYncy5NS2CZe3mX/kkkRyys YOFqL4RguCwQgHmWvWYsb6D/6qKjDZnMa3RQ18Ub1XWYkglZQ42D3KOjqj0uyaekiIXX Mc4P0+qDy3eG91FxWEX/ZER0rCps4iJvp8E413F1WuIklS/qAvq1rXTGYNEneuEwlNRT waZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:date:in-reply-to:comments :references:to:subject:mime-version; bh=Zl7OmZH6PQZnVjSGkVnp+5YLguxS4HYXkbwZx+QEHEs=; b=eDH6p4wNWCHcnq9sh/ARdiZTyfvXpO9bOx5QO4KuHO7W5uKEQTsgrZl5MWGvLS/ESw uso99eRI/iJTjdcBVr+tXVA4SJM15foDg12F9yXOkky56L+Ci4G5vTSHx2+cVCX3/Dg7 Oq4+OcUgCheF4buChLealohIN096dFlHNRgsv8HV4EepnpELQslZcdhpNaED2/UUT7Tf wM7urAHwCXPiJyrLS3Z4EaRK1UT93R+ab+F4shkem5QYgDO8c3eSBj7mUe7BIbLHeBLL 4I4yOwpI/x3MdjrdWx0bTPkSdQNpBmy4wegFn0WPTiKGeqFjc4XNc3NC0k3SAlUG7EMb c2uw== X-Gm-Message-State: AMke39lLD96Fe4oH6UcBWfhG5wkCKBv42b4G83CnESGc+uk9zNVrtnI9H7QqQBfsWWPLtg== X-Received: by 10.176.85.75 with SMTP id u11mr6381716uaa.36.1489038906498; Wed, 08 Mar 2017 21:55:06 -0800 (PST) From: Bart Schaefer Message-Id: <170308215536.ZM28061@torch.brasslantern.com> Date: Wed, 8 Mar 2017 21:55:36 -0800 In-Reply-To: Comments: In reply to Ferdinand Thiessen "Re: [BUG] umount mountpoint completion" (Mar 8, 3:08am) References: <8b983c55-f23e-2829-0131-c9970ec9b46b@gmx.de> <170305200130.ZM31787@torch.brasslantern.com> <39bf9cbd-8082-3fd6-54f9-8d1a3f498095@gmx.de> <170306151030.ZM18800@torch.brasslantern.com> <20170307111916.GA5002@fujitsu.shahaf.local2> <170307111447.ZM21964@torch.brasslantern.com> <08e58624-a55f-a772-396e-63120ebbadc8@gmx.de> <170307134915.ZM22299@torch.brasslantern.com> X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: Ferdinand Thiessen , zsh-workers@zsh.org Subject: Re: [BUG] umount mountpoint completion MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii OK, Ferdinand, let's try the following patch. There might still be the bug reported in 40761 by Philipp G. Haselwarter, but if so I think that's down to _canonical_paths and not _mount. diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount index 9ab279d..9a7041d 100644 --- a/Completion/Unix/Command/_mount +++ b/Completion/Unix/Command/_mount @@ -959,9 +959,15 @@ udevordir) esac local MATCH MBEGIN MEND - mp_tmp=("${(@g::)mp_tmp}") - dpath_tmp=( "${(@Mg::)dev_tmp:#/*}" ) - dev_tmp=( "${(@g::)dev_tmp:#/*}" ) + # The complicated substitution for mount point names is required because + # characters in /etc/mtab that might confuse programs reading the names + # are encoded as exactly 3 octal digits, like for example \040 for space. + # The cleaner-looking ${(g::)mp_tmp} might consume too many digits. + # Both mp_tmp and dev_tmp are derived from /etc/mtab or "mount" output. + mp_tmp=("${(@)mp_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}") + dev_tmp=("${(@)dev_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}") + dpath_tmp=( "${(@M)dev_tmp:#/*}" ) + dev_tmp=( "${(@)dev_tmp:#/*}" ) _alternative \ 'device-labels:device label:compadd -a dev_tmp' \