From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28831 invoked by alias); 11 Oct 2016 14:07:13 -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: 39608 Received: (qmail 20514 invoked from network); 11 Oct 2016 14:07:13 -0000 X-Qmail-Scanner-Diagnostics: from mailout2.w1.samsung.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(210.118.77.12):SA:0(-0.3/5.0):. Processed in 0.464665 secs); 11 Oct 2016 14:07:13 -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.3 required=5.0 tests=RP_MATCHES_RCVD autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: p.stephenson@samsung.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at samsung.com does not designate permitted sender hosts) X-AuditID: cbfec7f5-f79ce6d000004c54-13-57fcefae52fb Date: Tue, 11 Oct 2016 14:56:58 +0100 From: Peter Stephenson To: Zsh hackers list Subject: Re: Is "command" working right, yet? Message-id: <20161011145658.19c22e3a@pwslap01u.europe.root.pri> In-reply-to: <7ed97993-bd95-82b8-448c-e2170603a410@inlv.org> Organization: Samsung Cambridge Solution Centre X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu) MIME-version: 1.0 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsWy7djPc7rr3v8JN5h/QtLiYPNDJgdGj1UH PzAFMEZx2aSk5mSWpRbp2yVwZay7/Ye9YD9nxdUjmxgbGGezdzFyckgImEis/PeFEcIWk7hw bz1bFyMXh5DAUkaJZ2v+sEM4vUwSJ69fYILpeHTiCVTVMkaJlV0bmCCcaUwSex4chHLOMEo8 P9bDCOGcZZTonnSXDaSfRUBVYs3qdWDb2QQMJaZumg22XURAS2LHyZNA3RwcwgK6Ej9XFoKE eQXsJa78nccCEuYUsJHYOdceJMwvoC9x9e8nqIvsJWZeOcMIUS4o8WPyPRYQm1lAR2Lbtsfs ELa8xOY1b5kh6v+zSXTMZwMZKSEgK7HpADOE6SKxYycrRIWwxKvjW6AhJCPR2XEQalM/o8ST bl+QpyQEZjBKnD6zgw0iYS3Rd/siI8QqPolJ26ZDzeSV6GgTgjA9JI61BUFUO0qcObiRZQKj 4iwkN89CcvMsJDcvYGRexSiSWlqcm55abKpXnJhbXJqXrpecn7uJEZgATv87/nUH49JjVocY BTgYlXh4Jyz+HS7EmlhWXJl7iFGCg1lJhDfs3Z9wId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rx7 FlwJFxJITyxJzU5NLUgtgskycXBKNTAK8Z46u3DGsUqWqOkWNfefFfC/q54V4tkeOCe1NSvw RLmiusayvsB+MS3GSTsD3/y58TAxtO7xvljhMzaNZyemBj7dc8V4EvNW4Tlhjx60X40Qmqex ftGF5D0Nz7OmhteEelSt9tnAp9BTerT8x1LZ7PlKp/I4+Z0kOWfKPAgoe/gvjPHVn14lluKM REMt5qLiRAAaQKP3/AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsVy+t/xK7rT3v8JN9h/XNfiYPNDJgdGj1UH PzAFMEa52WSkJqakFimk5iXnp2TmpdsqhYa46VooKeQl5qbaKkXo+oYEKSmUJeaUAnlGBmjA wTnAPVhJ3y7BLWPd7T/sBfs5K64e2cTYwDibvYuRk0NCwETi0YknbBC2mMSFe+vBbCGBJYwS s3ZKdjFyAdkzmCR2/fvLCuGcY5TYNe0glHOWUWLi9xZmkBYWAVWJNavXgY1lEzCUmLppNiOI LSKgJbHj5EmmLkYODmEBXYmfKwtBwrwC9hJX/s5jAQlzCthI7JxrDzHyEIvE2S9PWEBq+AX0 Ja7+/cQEcZ29xMwrZxghegUlfky+B1bDDDR+87YmVghbXmLzmrfMEB+oS9y4u5t9AqPwLCQt s5C0zELSsoCReRWjSGppcW56brGhXnFibnFpXrpecn7uJkZgDG079nPzDsZLG4MPMQpwMCrx 8E5Y/DtciDWxrLgy9xCjBAezkghv2Ls/4UK8KYmVValF+fFFpTmpxYcYTYHhMpFZSjQ5Hxjf eSXxhiaG5paGRsYWFuZGRkrivCUfroQLCaQnlqRmp6YWpBbB9DFxcEo1MCrwtecc2ceiKP1p 6w+LvI93Fv7hfHfvgYyYNdfEg1xCk57bFoa8mnyhZuV/jR43V2Zdc/MbP/WXarlG5Pp/v/mo I//Xeb4NfDw23za1lzJGXVF/46C36bCOtVQX997Fn5T/TQk82Nf5cuOs3bKHD1Q/793qpazj HOmaI7PibprmNQu7qitPFZVYijMSDbWYi4oTAWb3gxe3AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161011135701eucas1p1f79c1d5db2dd53bdfa0230abf03d8f00 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?UGV0ZXIgU3RlcGhlbnNvbhtTQ1NDLURhdGEgUGxhbmUb?= =?UTF-8?B?7IK87ISx7KCE7J6QG1ByaW5jaXBhbCBFbmdpbmVlciwgU29mdHdhcmU=?= X-Global-Sender: =?UTF-8?B?UGV0ZXIgU3RlcGhlbnNvbhtTQ1NDLURhdGEgUGxhbmUbU2Ft?= =?UTF-8?B?c3VuZyBFbGVjdHJvbmljcxtQcmluY2lwYWwgRW5naW5lZXIsIFNvZnR3YXJl?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDA1Q0QwNTAwNTg=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20160926031819epcas3p1f38ba621e9a4d500877e2f8f5d1c28c8 X-RootMTR: 20160926031819epcas3p1f38ba621e9a4d500877e2f8f5d1c28c8 References: <160202163744.ZM2066@torch.brasslantern.com> <56B761B8.6000507@inlv.org> <160925201328.ZM24563@torch.brasslantern.com> <20160927110820.7661e8ad@pwslap01u.europe.root.pri> <564b0585-4286-a6c6-d64e-b190af5ace57@inlv.org> <20160928113028.42512c91@pwslap01u.europe.root.pri> <1c0f3af3-068e-32f5-ee52-5122d519a4b8@inlv.org> <20160929095524.48a716e1@pwslap01u.europe.root.pri> <7ed97993-bd95-82b8-448c-e2170603a410@inlv.org> On Tue, 11 Oct 2016 15:40:33 +0200 Martijn Dekker wrote: > Another issue crept in: 'command -v' and 'command -V' now always act as > if the -p option is given, i.e. they always search the default system > PATH for external commands rather than the current one. They are assuming -p is set, yes. pws diff --git a/Src/builtin.c b/Src/builtin.c index a274ff7..8b8b217 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -3663,7 +3663,7 @@ bin_whence(char *nam, char **argv, Options ops, int func) returnval = 1; } popheap(); - } else if (func == BIN_COMMAND && + } else if (func == BIN_COMMAND && OPT_ISSET(ops,'p') && (hn = builtintab->getnode(builtintab, *argv))) { /* * Special case for "command -p[vV]" which needs to @@ -3671,7 +3671,9 @@ bin_whence(char *nam, char **argv, Options ops, int func) */ builtintab->printnode(hn, printflags); informed = 1; - } else if ((cnam = findcmd(*argv, 1, func == BIN_COMMAND))) { + } else if ((cnam = findcmd(*argv, 1, + func == BIN_COMMAND && + OPT_ISSET(ops,'p')))) { /* Found external command. */ if (wd) { printf("%s: command\n", *argv);