From unknown Tue Aug 19 02:59:46 2025 X-Loop: help-debbugs@gnu.org Subject: bug#57247: [PATCH] em-unix.el: only pass -H option to grep Resent-From: "Brendan O'Dea" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 16 Aug 2022 17:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57247 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 57247@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16606702776102 (code B ref -1); Tue, 16 Aug 2022 17:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Aug 2022 17:17:57 +0000 Received: from localhost ([127.0.0.1]:48188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO0CS-0001aM-UF for submit@debbugs.gnu.org; Tue, 16 Aug 2022 13:17:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:56442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oO0CR-0001aE-I9 for submit@debbugs.gnu.org; Tue, 16 Aug 2022 13:17:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oO0CR-0003ea-DZ for bug-gnu-emacs@gnu.org; Tue, 16 Aug 2022 13:17:55 -0400 Received: from mail-oa1-f50.google.com ([209.85.160.50]:45792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oO0CP-00088C-IZ for bug-gnu-emacs@gnu.org; Tue, 16 Aug 2022 13:17:55 -0400 Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-11ba6e79dd1so7216349fac.12 for ; Tue, 16 Aug 2022 10:17:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc; bh=H0dtn3wks0tYlEdVIgh7BPyVF0E9UGRmr0KddCHYoIo=; b=lR1JPZZk64x47AdYUlrMZmRs92CivjpPnot70n7aTQd05y0tfTM8bz5y9Iacts3rW8 nA7q+JLyPLFRpQtH5xSYBQACSNOJKCEFz5irLDnwgP2KWP2y0eCxD3MVQ8BqpNu6kZFW j+IBzRwCg+LOpawC41eiO2am2882Lb2GRjY9hymy9RvvlwgZ62Pqs/ZZY/DV5uHaoHoh iOeCL/ejXXmLVzVlBD2nQhNZqU9JQZyIv7sjgiPSN+HoN1/xmEGbMh1EXERPacj5RP6y LdlpL8t7BMtJOHlfSiTb/Jd/WO3USnFf90bACNvkgRUB5XQTkaZFjTEvYNVfBPOSgBaf XTKg== X-Gm-Message-State: ACgBeo3VP30zipOOTKJmIPfPFZ4yCVPz84EWqjY1PBkJMi9qgMx8xQYM crXFZ6c9Z4UR+2XIlgCwglOzc6adAr+9UohzMVS7EYUciydfVfx0EVU= X-Google-Smtp-Source: AA6agR5s/fLSdHpPefB8uwKGP9jl2YoMFAdG2IIGjUHEdoBahHOJwIND2eVmeDlNw0faCc0bssqrugKWJhCFDthB8yY= X-Received: by 2002:a05:6870:a410:b0:10d:cd0f:572b with SMTP id m16-20020a056870a41000b0010dcd0f572bmr13522684oal.20.1660670271404; Tue, 16 Aug 2022 10:17:51 -0700 (PDT) MIME-Version: 1.0 From: "Brendan O'Dea" Date: Tue, 16 Aug 2022 13:17:40 -0400 Message-ID: Content-Type: multipart/mixed; boundary="0000000000009e904905e65eed1e" Received-SPF: none client-ip=209.85.160.50; envelope-from=bod@c47.org; helo=mail-oa1-f50.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.1 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.1 (---) --0000000000009e904905e65eed1e Content-Type: text/plain; charset="UTF-8" Tags: patch A recent change to eshell-grep added the -H option to cmd in order to ensure that the filename is always included in the output. This is fine for grep/egrep/fgrep, but breaks other uses if they don't support that flag: e.g. agrep/glimpse appear to use -H for a completely different purpose, one which requires an argument. In my case, I'm using it to define some eshell commands for some internal search tools which don't support the flag. Attached is a patch which moves the addition of the -H option only to the functions which call grep. --bod --0000000000009e904905e65eed1e Content-Type: text/x-patch; charset="US-ASCII"; name="em-unix.patch" Content-Disposition: attachment; filename="em-unix.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6wg6ban0 ZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VtLXVuaXguZWwgYi9saXNwL2VzaGVsbC9lbS11bml4 LmVsCmluZGV4IDY4Mjc2YjIyZDk1Li40MGI4MzAxMGY5NCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hl bGwvZW0tdW5peC5lbAorKysgYi9saXNwL2VzaGVsbC9lbS11bml4LmVsCkBAIC03NTUsMjYgKzc1 NSwyMSBAQCBlc2hlbGwtZ3JlcAogCQkJCSAgICAgIChlc2hlbGwtc3RyaW5naWZ5LWxpc3QKIAkJ CQkgICAgICAgKGZsYXR0ZW4tdHJlZSBhcmdzKSkpCiAJCQkgICAgICAiICIpKQotCSAgICAgKGNt ZCAoZm9ybWF0ICIlcyAtbkggJXMiCi0JCQkgIChwY2FzZSBjb21tYW5kCi0JCQkgICAgKCJlZ3Jl cCIgImdyZXAgLUUiKQotCQkJICAgICgiZmdyZXAiICJncmVwIC1GIikKLQkJCSAgICAoeCB4KSkK LQkJCSAgYXJncykpCisJICAgICAoY21kIChmb3JtYXQgIiVzIC1uICVzIiBjb21tYW5kIGFyZ3Mp KQogCSAgICAgY29tcGlsYXRpb24tc2Nyb2xsLW91dHB1dCkKIAkoZ3JlcCBjbWQpKSkpKQogCiAo ZGVmdW4gZXNoZWxsL2dyZXAgKCZyZXN0IGFyZ3MpCiAgICJVc2UgRW1hY3MgZ3JlcCBmYWNpbGl0 eSBpbnN0ZWFkIG9mIGNhbGxpbmcgZXh0ZXJuYWwgZ3JlcC4iCi0gIChlc2hlbGwtZ3JlcCAiZ3Jl cCIgYXJncyB0KSkKKyAgKGVzaGVsbC1ncmVwICJncmVwIiAoYXBwZW5kICcoIi1IIikgYXJncykg dCkpCiAKIChkZWZ1biBlc2hlbGwvZWdyZXAgKCZyZXN0IGFyZ3MpCiAgICJVc2UgRW1hY3MgZ3Jl cCBmYWNpbGl0eSBpbnN0ZWFkIG9mIGNhbGxpbmcgZXh0ZXJuYWwgZ3JlcCAtRS4iCi0gIChlc2hl bGwtZ3JlcCAiZWdyZXAiIGFyZ3MgdCkpCisgIChlc2hlbGwtZ3JlcCAiZ3JlcCIgKGFwcGVuZCAn KCItRUgiKSBhcmdzKSB0KSkKIAogKGRlZnVuIGVzaGVsbC9mZ3JlcCAoJnJlc3QgYXJncykKICAg IlVzZSBFbWFjcyBncmVwIGZhY2lsaXR5IGluc3RlYWQgb2YgY2FsbGluZyBleHRlcm5hbCBncmVw IC1GLiIKLSAgKGVzaGVsbC1ncmVwICJmZ3JlcCIgYXJncyB0KSkKKyAgKGVzaGVsbC1ncmVwICJn cmVwIiAoYXBwZW5kICcoIi1GSCIpIGFyZ3MpIHQpKQogCiAoZGVmdW4gZXNoZWxsL2FncmVwICgm cmVzdCBhcmdzKQogICAiVXNlIEVtYWNzIGdyZXAgZmFjaWxpdHkgaW5zdGVhZCBvZiBjYWxsaW5n IGV4dGVybmFsIGFncmVwLiIK --0000000000009e904905e65eed1e-- From unknown Tue Aug 19 02:59:46 2025 X-Loop: help-debbugs@gnu.org Subject: bug#57247: [PATCH] em-unix.el: only pass -H option to grep Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 17 Aug 2022 11:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57247 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: "Brendan O'Dea" Cc: 57247@debbugs.gnu.org Received: via spool by 57247-submit@debbugs.gnu.org id=B57247.166073523918239 (code B ref 57247); Wed, 17 Aug 2022 11:21:01 +0000 Received: (at 57247) by debbugs.gnu.org; 17 Aug 2022 11:20:39 +0000 Received: from localhost ([127.0.0.1]:49594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOH6F-0004k7-Gr for submit@debbugs.gnu.org; Wed, 17 Aug 2022 07:20:39 -0400 Received: from quimby.gnus.org ([95.216.78.240]:44680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOH6D-0004js-Pa for 57247@debbugs.gnu.org; Wed, 17 Aug 2022 07:20:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=GxhgIpOIjR2pyqJUzZv6CYv4hxyOOpGDkdq5XV86nH0=; b=fQraiAaGKN/lrIp47j7TEskLHq ujKoAkDXWN/STrWWlCSlMXU6ljMWfHeET4pB7frScL6dqD/rfv5plwktctIs056rtDJXCcOaWiVDp NVJo97NP4dU+XMqj25+fzW1mDmeL+1r2vnYM8G2EZdv9IbiLDHePSZ5eQEMNBaWl0IK8=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOH65-0008QZ-Q5; Wed, 17 Aug 2022 13:20:31 +0200 From: Lars Ingebrigtsen In-Reply-To: (Brendan O'Dea's message of "Tue, 16 Aug 2022 13:17:40 -0400") References: X-Now-Playing: Zazou, Bikaye, CY1's _It's a Crammed, Crammed, Crammed, Crammed World!_: "Dju ya feza" Date: Wed, 17 Aug 2022 13:20:29 +0200 Message-ID: <871qtfi0aq.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: "Brendan O'Dea" writes: > Attached is a patch which moves the addition of the -H option only to > the functions which call grep. Thanks; pushed to Emacs 29. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) "Brendan O'Dea" writes: > Attached is a patch which moves the addition of the -H option only to > the functions which call grep. Thanks; pushed to Emacs 29. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 17 07:20:45 2022 Received: (at control) by debbugs.gnu.org; 17 Aug 2022 11:20:45 +0000 Received: from localhost ([127.0.0.1]:49597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOH6K-0004kO-Pn for submit@debbugs.gnu.org; Wed, 17 Aug 2022 07:20:45 -0400 Received: from quimby.gnus.org ([95.216.78.240]:44694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOH6J-0004jy-7y for control@debbugs.gnu.org; Wed, 17 Aug 2022 07:20:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=b1Zij2107u6XBVKVQ9K+TGGmSaFI3Tdzuswk51pL5Iw=; b=rCybGWUh4N1+hk8R6Fc+tyaF2e 0aeXJcuNlTuo5wxcvo8qIGCqBBdjHERyn5Tq918imS4lXuEmIdH8rCtNPmJRHP4k8BRRiJQB//9/K BA80cOErelfRM3sFBUD1rRPUmQn2ZUlN7KFX/CjPnURlVwkVTH6mKxZ7fslmrkiuknhw=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOH6B-0008Qf-L3 for control@debbugs.gnu.org; Wed, 17 Aug 2022 13:20:37 +0200 Date: Wed, 17 Aug 2022 13:20:33 +0200 Message-Id: <87zgg3glq6.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #57247 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 57247 29.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 57247 29.1 quit