From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#48302: [PATCH] Abbreviate `find' properties in M-x rgrep on MS Windows Date: Sat, 8 May 2021 15:17:14 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000bcfe7d05c1d8e887" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5185"; mail-complaints-to="usenet@ciao.gmane.io" To: 48302@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun May 09 00:18:11 2021 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 1lfVH0-0001CL-R1 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 09 May 2021 00:18:10 +0200 Original-Received: from localhost ([::1]:49294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfVGz-0005aT-AK for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 08 May 2021 18:18:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfVGs-0005a5-IG for bug-gnu-emacs@gnu.org; Sat, 08 May 2021 18:18:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfVGs-0001Qq-AV for bug-gnu-emacs@gnu.org; Sat, 08 May 2021 18:18:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfVGs-0008JX-3x for bug-gnu-emacs@gnu.org; Sat, 08 May 2021 18:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 08 May 2021 22:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48302 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.162051225131949 (code B ref -1); Sat, 08 May 2021 22:18:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 8 May 2021 22:17:31 +0000 Original-Received: from localhost ([127.0.0.1]:52606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfVGM-0008JF-LG for submit@debbugs.gnu.org; Sat, 08 May 2021 18:17:30 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:50906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfVGL-0008J9-1n for submit@debbugs.gnu.org; Sat, 08 May 2021 18:17:29 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfVGK-0005ZY-P1 for bug-gnu-emacs@gnu.org; Sat, 08 May 2021 18:17:28 -0400 Original-Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:35806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfVGJ-00014k-2E for bug-gnu-emacs@gnu.org; Sat, 08 May 2021 18:17:28 -0400 Original-Received: by mail-pj1-x1035.google.com with SMTP id h14-20020a17090aea8eb02901553e1cc649so8027247pjz.0 for ; Sat, 08 May 2021 15:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=5scQ3yS9tak0DkML9X6P/YrN0b7XW5rZIRTdBYfGkMc=; b=r4H9EWPTTZTM3trRIP8K/Q4OsVVFbhXNMk68bxaB/LFeY2Vx1UTR6XDIqy7PQuRYNw Ey+2EoLVLaQd2pchBlQZrw20iroPf1xldtbj0slye1SrMCsGPP/GAT6dpnPMmgLje4HC 2VBIImg+xBHtWu8SQH51DgizcoA6wUuqz63UWDl6erN3kM72tAmVdn2OmxQmfgimsSEm /GiJ0Tk3DlHVhH3QMUQ4nZt4y9oOomnOMPAuhf1QNnpQ2/zfltAFbaXrHYsbRE4GpEfz rcwzJyvH6MppM6iBW4rqkPdS1OcHt6YtMdw3SKod0pb+38JBFi4zW7oa2Oyag2MhJTO/ l1KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=5scQ3yS9tak0DkML9X6P/YrN0b7XW5rZIRTdBYfGkMc=; b=ERkDw6Jc1GtxfpWbCqZNLYutO9JsK2BK5dqsEoKsDwyN1xhfhc/wWmTxr8phS+RYyR 3E1yuMVe+C3oGUCkdDn9OOlTFzQ8UIoiWG+Y1tZ4dtvq7qV/gad3tysgZ9dyJOHfLNF7 ud0t4//WksXcbd8UBs8zSHsEvbeeji971kfJcD9FVrldscmG5H46smKUSFIhgfB11oiA +Xqu8UwQvQCGJL/gdDy51lox7WMkC2F7ZdQxEDpal+hU48VPQSbjckxLP1/5i2ITd8Hr tYyHx51Rvc0kA4F8OGhJ69vH5cMEChc4Z4hn/MCggx40DERqdLhJqD4EzDvKgw28Fs5V T+wg== X-Gm-Message-State: AOAM533CGu6wnsC9wkwGp9Vs9RTdBooDjf8CKfaLl7eCQG2N780ynezP G2RFn8RoB/LsTgA06Ognv8M49g9QtqV6u2VJtCZSejmccrFwmA== X-Google-Smtp-Source: ABdhPJznz3W++0BvCuTOzhP7thY2/LrWKHFy8K/I40Y9OJ+JTBLAf6Z2WRrrypd9Naso0YQlBS5Nj/hd3vsR+Z6Bb54= X-Received: by 2002:a17:90a:2ec6:: with SMTP id h6mr31157380pjs.103.1620512245342; Sat, 08 May 2021 15:17:25 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=jporterbugs@gmail.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Xref: news.gmane.io gmane.emacs.bugs:206033 Archived-At: --000000000000bcfe7d05c1d8e887 Content-Type: text/plain; charset="UTF-8" MS Windows has different shell-quoting logic from POSIX shells, so the regexp to abbreviate the `find' command's properties in rgrep fails to match on MS Windows. The attached patch fixes this by looking for either `\)' (POSIX) or `")"' (MS Windows) as the end of the properties list. Steps to reproduce: ;; Ensure GNU find and grep are in your path emacs -Q M-x rgrep RET foo RET RET RET ;; See the full, unabbreviated command instead of `find [...] -exec grep'... To make things easier to review for people without access to MS Windows, this is the full invocation for rgrep: ---------- Begin Block ---------- find . -type d "(" -path "*/SCCS" -o -path "*/RCS" -o -path "*/CVS" -o -path "*/MCVS" -o -path "*/.src" -o -path "*/.svn" -o -path "*/.git" -o -path "*/.hg" -o -path "*/.bzr" -o -path "*/_MTN" -o -path "*/_darcs" -o -path "*/{arch}" ")" -prune -o ^"^!^" -type d "(" -name ".#*" -o -name "*.o" -o -name "*~" -o -name "*.bin" -o -name "*.bak" -o -name "*.obj" -o -name "*.map" -o -name "*.ico" -o -name "*.pif" -o -name "*.lnk" -o -name "*.a" -o -name "*.ln" -o -name "*.blg" -o -name "*.bbl" -o -name "*.dll" -o -name "*.drv" -o -name "*.vxd" -o -name "*.386" -o -name "*.elc" -o -name "*.lof" -o -name "*.glo" -o -name "*.idx" -o -name "*.lot" -o -name "*.fmt" -o -name "*.tfm" -o -name "*.class" -o -name "*.fas" -o -name "*.lib" -o -name "*.mem" -o -name "*.x86f" -o -name "*.sparcf" -o -name "*.dfsl" -o -name "*.pfsl" -o -name "*.d64fsl" -o -name "*.p64fsl" -o -name "*.lx64fsl" -o -name "*.lx32fsl" -o -name "*.dx64fsl" -o -name "*.dx32fsl" -o -name "*.fx64fsl" -o -name "*.fx32fsl" -o -name "*.sx64fsl" -o -name "*.sx32fsl" -o -name "*.wx64fsl" -o -name "*.wx32fsl" -o -name "*.fasl" -o -name "*.ufsl" -o -name "*.fsl" -o -name "*.dxl" -o -name "*.lo" -o -name "*.la" -o -name "*.gmo" -o -name "*.mo" -o -name "*.toc" -o -name "*.aux" -o -name "*.cp" -o -name "*.fn" -o -name "*.ky" -o -name "*.pg" -o -name "*.tp" -o -name "*.vr" -o -name "*.cps" -o -name "*.fns" -o -name "*.kys" -o -name "*.pgs" -o -name "*.tps" -o -name "*.vrs" -o -name "*.pyc" -o -name "*.pyo" ")" -prune -o -type f "(" -iname "*" -o -iname ^".[^!.]*^" -o -iname "..?*" ")" -exec grep --color=always -i -nH --null "foo" "{}" ";" ---------- End Block ---------- --000000000000bcfe7d05c1d8e887 Content-Type: application/octet-stream; name="0001-Abbreviate-rgrep-command-when-using-MS-Windows-style.patch" Content-Disposition: attachment; filename="0001-Abbreviate-rgrep-command-when-using-MS-Windows-style.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kogb0r8d0 RnJvbSA2NzYwNDU3Yzc4Y2MwYmQyOTMwNWY1OTg5MTMwMDEyYzE0MmExMDhhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5jb20+CkRh dGU6IFNhdCwgOCBNYXkgMjAyMSAxNDo1NDoyMCAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFiYnJl dmlhdGUgcmdyZXAgY29tbWFuZCB3aGVuIHVzaW5nIE1TIFdpbmRvd3Mtc3R5bGUKIHNoZWxsLXF1 b3RpbmcKCmxpc3AvcHJvZ21vZGVzL2dyZXAuZWwgKGdyZXAtbW9kZS1mb250LWxvY2sta2V5d29y ZHMpOiBBZGFwdCByZWdleHAgdG8gbWF0Y2gKTVMgV2luZG93cy1zdHlsZSBzaGVsbC1xdW90aW5n LgotLS0KIGxpc3AvcHJvZ21vZGVzL2dyZXAuZWwgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBp bnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9saXNwL3Byb2dtb2Rlcy9n cmVwLmVsIGIvbGlzcC9wcm9nbW9kZXMvZ3JlcC5lbAppbmRleCBlOWZiY2JiZmNkLi44MGMzZTc4 NDBmIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9ncmVwLmVsCisrKyBiL2xpc3AvcHJvZ21v ZGVzL2dyZXAuZWwKQEAgLTQ3Myw3ICs0NzMsNyBAQCBncmVwLW1vZGUtZm9udC1sb2NrLWtleXdv cmRzCiAgICAgICAoMSAoaWYgKGVxIChjaGFyLWFmdGVyIChtYXRjaC1iZWdpbm5pbmcgMSkpID9c MCkKICAgICAgICAgICAgICBgKGZhY2UgbmlsIGRpc3BsYXkgLChtYXRjaC1zdHJpbmcgMikpKSkp CiAgICAgIDs7IEhpZGUgZXhjZXNzaXZlIHBhcnQgb2YgcmdyZXAgY29tbWFuZAotICAgICAoIl5m aW5kIFxcKFxcLiAtdHlwZSBkIC4qXFxcXClcXCkiCisgICAgICgiXmZpbmQgXFwoXFwuIC10eXBl IGQgLipcXCg/OlxcXFwpXFx8XCIpXCJcXClcXCkiCiAgICAgICAoMSAoaWYgZ3JlcC1maW5kLWFi YnJldmlhdGUgZ3JlcC1maW5kLWFiYnJldmlhdGUtcHJvcGVydGllcwogICAgICAgICAgICAnKGZh Y2UgbmlsIGFiYnJldmlhdGVkLWNvbW1hbmQgdCkpKSkKICAgICAgOzsgSGlkZSBleGNlc3NpdmUg cGFydCBvZiBsZ3JlcCBjb21tYW5kCi0tIAoyLjI1LjEKCg== --000000000000bcfe7d05c1d8e887--