From: Eric Abrahamsen <eric@ericabrahamsen.net>
To: 46271@debbugs.gnu.org
Cc: jflack@disroot.org
Subject: bug#46271: 28.0.50; [PATCH] Properly quote group names for gnus-search
Date: Sun, 07 Feb 2021 14:26:39 -0800 [thread overview]
Message-ID: <87o8gvjyzk.fsf@ericabrahamsen.net> (raw)
In-Reply-To: <875z38zrg4.fsf@ericabrahamsen.net> (Eric Abrahamsen's message of "Wed, 03 Feb 2021 15:01:31 -0800")
Eric Abrahamsen <eric@ericabrahamsen.net> writes:
> jflack--- via "Bug reports for GNU Emacs, the Swiss army knife of text
> editors" <bug-gnu-emacs@gnu.org> writes:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA512
>>
>> - --=-=-=
>> Content-Type: text/plain
>> Content-Transfer-Encoding: quoted-printable
>>
>>
>> The new gnus-search-indexed-parse-output doesn't properly quote group
>> names before using them as regexes meaning a group name containing
>> meta-characters (other than . or \ because of the current replacement)
>> won't be properly matched in the search results later.
>>
>> I have attached a diff that fixes this by first quoting the group name
>> before performing the replacement; which is now constructed with RX
>> to save \\ soup.
>>
>> =2D-=20
>> Thanks,
>> Jai
>>
>> - --=-=-=
>> Content-Type: text/x-diff
>> Content-Disposition: attachment; filename=gnus-search-regex.diff
>> Content-Transfer-Encoding: quoted-printable
>>
>> diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
>> index 44f43b073c..54603d8792 100644
>> =2D-- a/lisp/gnus/gnus-search.el
>> +++ b/lisp/gnus/gnus-search.el
>> @@ -82,6 +82,7 @@
>> (require 'gnus-util)
>> (require 'eieio)
>> (eval-when-compile (require 'cl-lib))
>> +(eval-when-compile (require 'rx))
>> (autoload 'eieio-build-class-alist "eieio-opt")
>> (autoload 'nnmaildir-base-name-to-article-number "nnmaildir")
>> =20
>> @@ -1380,8 +1381,8 @@ gnus-search-indexed-parse-output
>> (lambda (x)
>> (replace-regexp-in-string
>> ;; Accept any of [.\/] as path separators.
>> =2D "[.\\/]" "[.\\\\/]"
>> =2D (gnus-group-real-name x)))
>> + (rx (or "\\." "\\\\" "/")) "[.\\\\/]"
>> + (regexp-quote (gnus-group-real-name x))))
>> groups "\\|")))
>> artlist vectors article group)
>> (goto-char (point-min))
>
> Thanks very much for the patch! Let me do some local testing over the
> next couple of days, but at first glance this looks like it will do the
> trick.
Finally getting to this...
This doesn't quite do what it intends to do, as the
`replace-regexp-in-string' interferes with the `regexp-quote'. To wit:
(let ((group-name "mail+"))
(replace-regexp-in-string
"[.\\/]" "[.\\\\/]"
(regexp-quote (gnus-group-real-name group-name))))
-> "mail[.\\/]+"
But what we wanted was:
"mail\\+"
So I think it has to get messier:
(let ((groups '("mail+" "gnus.gener+al" "archive.2007.10")))
(mapconcat
#'identity
(mapcar
(lambda (group-name)
(mapconcat #'regexp-quote
(split-string
(gnus-group-real-name group-name)
"[.\\/]")
"[.\\\\/]"))
groups)
"\\|"))
-> "mail\\+\\|gnus[.\\\\/]gener\\+al\\|archive[.\\\\/]2007[.\\\\/]10"
This looks right to me. WDYT?
Also, I'd prefer not to use rx in this case, simply because this:
"[.\\/]"
turns into this:
(rx (or "\\." "\\\\" "/"))
Which seems like a loss of readability, though in general I think rx is
a very good idea.
Thanks again for the report!
Eric
next prev parent reply other threads:[~2021-02-07 22:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 13:31 bug#46271: 28.0.50; [PATCH] Properly quote group names for gnus-search jflack--- via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-02-03 18:54 ` Basil L. Contovounesios
2021-02-04 0:52 ` jflack--- via Bug reports for GNU Emacs, the Swiss army knife of text editors
2021-02-06 10:38 ` Basil L. Contovounesios
2021-02-03 23:01 ` Eric Abrahamsen
2021-02-07 22:26 ` Eric Abrahamsen [this message]
2021-02-08 19:11 ` Basil L. Contovounesios
2021-02-08 20:13 ` Eric Abrahamsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o8gvjyzk.fsf@ericabrahamsen.net \
--to=eric@ericabrahamsen.net \
--cc=46271@debbugs.gnu.org \
--cc=jflack@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).