From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#71935: split-string-and-unquote mishandles dired-listing-switches with ' Date: Fri, 05 Jul 2024 09:48:39 +0300 Organization: LINKOV.NET Message-ID: <86sewoqqpk.fsf@mail.linkov.net> References: <86tth5tztt.fsf@mail.linkov.net> <86zfqx8tnn.fsf@gnu.org> <86a5ixqhd4.fsf@mail.linkov.net> <868qyh82is.fsf@gnu.org> <8634opowlq.fsf@mail.linkov.net> <8634op80r5.fsf@gnu.org> <86tth52dkl.fsf@mail.linkov.net> <86wmm16kuz.fsf@gnu.org> <86tth56kgw.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12925"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu) Cc: 71935@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 05 08:57:27 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sPcso-0003FE-NH for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Jul 2024 08:57:26 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPcsP-0000eG-6K; Fri, 05 Jul 2024 02:57:01 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPcsN-0000dq-Ty for bug-gnu-emacs@gnu.org; Fri, 05 Jul 2024 02:56:59 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPcsN-0007Xg-Ll for bug-gnu-emacs@gnu.org; Fri, 05 Jul 2024 02:56:59 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPcsQ-0007lZ-9s for bug-gnu-emacs@gnu.org; Fri, 05 Jul 2024 02:57:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Jul 2024 06:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71935 X-GNU-PR-Package: emacs Original-Received: via spool by 71935-submit@debbugs.gnu.org id=B71935.172016257829789 (code B ref 71935); Fri, 05 Jul 2024 06:57:02 +0000 Original-Received: (at 71935) by debbugs.gnu.org; 5 Jul 2024 06:56:18 +0000 Original-Received: from localhost ([127.0.0.1]:43454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPcri-0007kP-9b for submit@debbugs.gnu.org; Fri, 05 Jul 2024 02:56:18 -0400 Original-Received: from relay1-d.mail.gandi.net ([217.70.183.193]:50695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPcrg-0007k9-6r for 71935@debbugs.gnu.org; Fri, 05 Jul 2024 02:56:16 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 4BD12240004; Fri, 5 Jul 2024 06:56:05 +0000 (UTC) In-Reply-To: <86tth56kgw.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 04 Jul 2024 22:11:27 +0300") X-GND-Sasl: juri@linkov.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:288410 Archived-At: >> > @@ -8195,9 +8193,11 @@ insert-directory >> > - (if (stringp switches) >> > - switches >> > - (mapconcat #'identity switches " ")) >> > + (mapconcat #'shell-quote-argument >> > + (if (stringp switches) >> > + (split-string-and-unquote switches) >> > + switches) >> > + " ") >> >> Thanks, that's what I had in mind. Please install on the emacs-30 >> branch. > > On second thought: could there be options that include shell > wildcards, which therefore should not be quoted? If so, perhaps > instead of shell-quote-argument we should use > shell-quote-wildcard-pattern? Indeed, there are ls switches that use wildcards, e.g. ‘--hide=PATTERN’ and ‘--ignore=PATTERN’. But it seems they are ignored anyway while using wildcards with 'ls -d', so I can't test them. What I can confirm only is that with 1. (setopt dired-listing-switches "-al --block-size='1 --ignore=system*") 2. C-x d /tmp/s* the switches are correctly quoted by 'shell-quote-wildcard-pattern': "ls -d --dired -N -al --block-size=\\'1 --ignore=system* -- s*" diff --git a/lisp/files.el b/lisp/files.el index 042b8e2d515..e69dfb22a5f 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -8195,9 +8193,15 @@ insert-directory "\\") ; Disregard Unix shell aliases! insert-directory-program " -d " - (if (stringp switches) - switches - (mapconcat #'identity switches " ")) + ;; Quote switches that require quoting + ;; such as "--block-size='1". But don't + ;; quote switches that use patterns + ;; such as "--ignore=PATTERN" (bug#71935). + (mapconcat #'shell-quote-wildcard-pattern + (if (stringp switches) + (split-string-and-unquote switches) + switches) + " ") " -- " ;; Quote some characters that have ;; special meanings in shells; but