From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1699 invoked by alias); 29 Nov 2017 17:19:45 -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: List-Unsubscribe: X-Seq: 42060 Received: (qmail 29628 invoked by uid 1010); 29 Nov 2017 17:19:45 -0000 X-Qmail-Scanner-Diagnostics: from out4-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.28):SA:0(-2.6/5.0):. Processed in 2.782202 secs); 29 Nov 2017 17:19:45 -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=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=ham 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: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=4aXGT22qkgVw+XgSvthsANXPsa5D4 HICihuLMC1xFYA=; b=YMDlyi41Tc4laTyOQ2WrRf4zs7W9u0A3zXDidm5HKs/YR q7cl4Y4WsRqJWzUYU0W+e7pH3z+3Uq1YqYF/6n8IjyuueyFU+C2LZhQTNHk8IpHb Qd94JHv6hgrFqAsT6+kSOayjpPdn2oIeUz5Z+B2L5nvU6PPBD/scCLYY3NAGDolp dwv1BJL/BUSvxwQsS6pw7GfAyHn2X7wIR9SgwYFFVs5RlOvFnpURRisLv0pqdtuu KsI9jvFqT/sSrmu0Jjf5djRXLtz0+GBXfx5GC0Yw4DE4CGARYyMetHOs4EI0iyKR zFriPTha2bw3nCZU5J9e8MRZZYDQWoz9UIQ36cROw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=4aXGT22qkgVw+XgSvthsANXPsa5D4 HICihuLMC1xFYA=; b=dFdtXp+MLvvLgLJ25nzgnODQVsnmmyyrnt+y4cHDkkimr n5cNNqMShtksWVolnCVcgVX5Y08Hvw7ILvVVM+2XE6f4jX0uXvUvHUml6fcefuc9 PYyP/0EfX1WYv/JMwcuODlPG3x1FhyTagQ4bTVuaox3kwilrSY23hbRzGDS4F8O0 C2ljwPQNi3XUi2XrE6QfDhZ1UTVSuByVyUU9Ej+KDZEm7fF9frKrEwGPLigU7uHM k7IKQqJ1fTNc1R5nh5HNNvWbkUBzRj85Mq5yg8Aj7qWKwzzQHWDhWel8KsrPSZIk wqhhFt4mz5y/ZRrZDwYOoQzuiUuSkfrOTeynhdvUQ== X-ME-Sender: Date: Wed, 29 Nov 2017 17:19:33 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: 'rm foo * bar' and answering 'n' runs 'rm foo bar' Message-ID: <20171129171933.jnctgmvbicuhrf6j@tarpaulin.shahaf.local2> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="xc7vm5q4phanfa7p" Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: NeoMutt/20170113 (1.7.2) --xc7vm5q4phanfa7p Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit As the subject says: $ zsh -f % cd $(mktemp -d) % touch foo bar baz % rm foo * bar zsh: sure you want to delete all 3 files in /tmp/tmp.e9ZNT40K4y [yn]? n % ls baz % This is counter-intuitive: users expect 'n' to abort the command entirely. It was brought up nine years ago: Thread starts: http://www.zsh.org/cgi-bin/mla/redirect?USERNUMBER=13141 Stéphane's patch: http://www.zsh.org/cgi-bin/mla/redirect?USERNUMBER=13148 Review: http://www.zsh.org/cgi-bin/mla/redirect?USERNUMBER=13149 Review: http://www.zsh.org/cgi-bin/mla/redirect?USERNUMBER=13150 So... Shall we commit users/13148? Mikael had a rebased version available, I've attached it (with permission). Cheers, Daniel --xc7vm5q4phanfa7p Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="13148-rebased.patch" diff --git a/Src/exec.c b/Src/exec.c index bd64a2d28..3ac488a81 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -3249,19 +3249,24 @@ execcmd_exec(Estate state, Execcmd_params eparams, next = nextnode(node); if (s[0] == Star && !s[1]) { - if (!checkrmall(pwd)) - uremnode(args, node); + if (!checkrmall(pwd)) { + errflag |= ERRFLAG_ERROR; + break; + } } else if (l >= 2 && s[l - 2] == '/' && s[l - 1] == Star) { char t = s[l - 2]; + int rmall; s[l - 2] = 0; - if (!checkrmall(*s ? s : "/")) - uremnode(args, node); + rmall = checkrmall(s); s[l - 2] = t; + + if (!rmall) { + errflag |= ERRFLAG_ERROR; + break; + } } } - if (!nextnode(firstnode(args))) - errflag |= ERRFLAG_ERROR; } if (type == WC_FUNCDEF) { --xc7vm5q4phanfa7p--