From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: sbaugh@catern.com Newsgroups: gmane.emacs.bugs Subject: bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping Date: Fri, 22 Sep 2023 01:36:47 +0000 (UTC) Message-ID: <874jjnvvip.fsf@catern.com> References: <80d8aeb0-c9f1-410f-b83d-60f83ca5b3af@email.android.com> <83led8ls3z.fsf@gnu.org> <835y4ckkzu.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40007"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 65902@debbugs.gnu.org, Spencer Baugh , jporterbugs@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 22 03:38:08 2023 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 1qjV7P-000ABU-Aj for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Sep 2023 03:38:08 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjV7C-0005W8-Vg; Thu, 21 Sep 2023 21:37:54 -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 1qjV7A-0005Vj-Fu for bug-gnu-emacs@gnu.org; Thu, 21 Sep 2023 21:37:52 -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 1qjV7A-00022A-7a for bug-gnu-emacs@gnu.org; Thu, 21 Sep 2023 21:37:52 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjV7K-00086k-1m for bug-gnu-emacs@gnu.org; Thu, 21 Sep 2023 21:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: sbaugh@catern.com Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Sep 2023 01:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65902 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 65902-submit@debbugs.gnu.org id=B65902.169534663031084 (code B ref 65902); Fri, 22 Sep 2023 01:38:02 +0000 Original-Received: (at 65902) by debbugs.gnu.org; 22 Sep 2023 01:37:10 +0000 Original-Received: from localhost ([127.0.0.1]:35032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjV6T-00085I-N6 for submit@debbugs.gnu.org; Thu, 21 Sep 2023 21:37:10 -0400 Original-Received: from s.wrqvtbkv.outbound-mail.sendgrid.net ([149.72.123.24]:24778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjV6O-00084f-0K for 65902@debbugs.gnu.org; Thu, 21 Sep 2023 21:37:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=catern.com; h=from:subject:in-reply-to:references:mime-version:to:cc:content-type: cc:content-type:from:subject:to; s=s1; bh=nyLhZkA0zo2cA6svc0McbWL3RLafePY4+JHmp7fQogg=; b=ammzF6BJKcx59avgpJncVdsYVPohCntMq5I+r4fj76psi3jss/3BliiLthcIir9k4B47 fnhhSadzi97NhJ2WvN2xzL8L6UcnumkITkJitQFHE3C+1reo51Nx2WyAaIAhZCTC07v8YU 6owucL/LB29zC6kKuzBnAIS4pX+6O5B/uJXDB8LLzOCavXNHDV46Lrq5nBTi1J7gx12hNn 9hclAOsJsT6/+2Yp+EpnZOWBhzQ2an1ZHpdxJ/32S+lGj3LIIar/cpoIBDvwjHva+c2UzF 9of67tRc9/YJfaro0g7+7zn4iqOcsteHYfdXqsloogeOtJHoCbzemRlXVaeWkILQ== Original-Received: by filterdrecv-84b96456cb-2mccf with SMTP id filterdrecv-84b96456cb-2mccf-1-650CEFAF-9 2023-09-22 01:36:47.306839535 +0000 UTC m=+11584715.869149617 Original-Received: from earth.catern.com (unknown) by geopod-ismtpd-21 (SG) with ESMTP id 2PM24CXGQZqWig4T128qcQ Fri, 22 Sep 2023 01:36:47.084 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=::1; helo=localhost; envelope-from=sbaugh@catern.com; receiver=gnu.org Original-Received: from localhost (localhost [IPv6:::1]) by earth.catern.com (Postfix) with ESMTPSA id 83FA4656A5; Thu, 21 Sep 2023 21:36:46 -0400 (EDT) In-Reply-To: <835y4ckkzu.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 15 Sep 2023 09:29:09 +0300") X-SG-EID: ZgbRq7gjGrt0q/Pjvxk7wM0yQFRdOkTJAtEbkjCkHbJNyIwq5KhjaYsgDkt2FahRN+yXCp9KeieX+XiKh4IQpl/fFT6HJt6/gCp8Uxk71rJIfqD7x+/j2F7Cjg2j6hu5DDX3gsZ3uk/NAKcYGCRjZmFe8UiLoikskfPRAu4QEd21oDmCUfDGBydP0Lyh45qirQsBUdXfbBbZPw08so+GUg== X-Entity-ID: d/0VcHixlS0t7iB1YKCv4Q== 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:271032 Archived-At: --=-=-= Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Eli Zaretskii writes: >> From: Spencer Baugh >> Cc: Spencer Baugh , 65902@debbugs.gnu.org, >> jporterbugs@gmail.com >> Date: Thu, 14 Sep 2023 11:10:44 -0400 >> >> We could make a command-line-args-left equivalent for emacsclient, >> called server-eval-args-left, which contains the FILE arguments passed >> to emacsclient as strings. This can be done without making any changes >> to emacsclient.c or the server protocol. Then the message-mailto >> use case would look like this: >> >> emacsclient --eval '(message-mailto (pop server-eval-args-left))' %u >> >> This would match how message-mailto uses (pop command-line-args-left) >> internally. >> >> This would work for all the use-cases I described before; I'd be very >> happy with this solution (actually, I'm starting to prefer it to >> --apply). And again, it doesn't change emacsclient.c or the server >> protocol. > > This could perhaps be acceptable (although it's still rather kludgey, > IMO), but are you sure you understand all the consequences? > Currently, when emacsclient is invoked like this: > > $ emacsclient --eval '(func args)' foo bar > > we send to the server the following commands: > > -eval (func args) > -eval foo > -eval bar > > IOW, every command-line argument after --eval is treated as being > implicitly preceded with --eval. > > With your proposal, how will the server know that some of "-eval foo" > commands should cause foo to be added to server-eval-args-left instead > of being evaluated as it does now? As in the attached patch. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Add-server-eval-args-left-to-server.el.patch >From 1f0ff370a23eee1fdf740527efa75c0ddbe625bb Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 21 Sep 2023 21:35:50 -0400 Subject: [PATCH] Add server-eval-args-left to server.el Passing arbitrary arguments to functions through emacsclient --eval requires complicated escaping to avoid them being parsed as Lisp (as seen in emacsclient-mail.desktop before this change). This new variable server-eval-args-left allows access to the arguments before they are parsed as Lisp. By removing arguments from the variable before they're parsed, a snippet of Lisp can consume arguments, as in emacsclient-mail.desktop. org-protocol might be able to use this as well, which might allow it to drop its current advice on server-visit-files. * etc/emacsclient-mail.desktop: Use server-eval-args-left. (bug#65902) * lisp/server.el (server-eval-args-left): Add. (server-process-filter, server-execute): Make -eval arguments available through server-eval-args-left. --- etc/emacsclient-mail.desktop | 7 ++----- lisp/server.el | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/etc/emacsclient-mail.desktop b/etc/emacsclient-mail.desktop index 0a2420ddead..5962fa1764c 100644 --- a/etc/emacsclient-mail.desktop +++ b/etc/emacsclient-mail.desktop @@ -1,10 +1,7 @@ [Desktop Entry] Categories=Network;Email; Comment=GNU Emacs is an extensible, customizable text editor - and more -# We want to pass the following commands to the shell wrapper: -# u=$(echo "$1" | sed 's/[\"]/\\&/g'); exec emacsclient --alternate-editor= --display="$DISPLAY" --eval "(message-mailto \"$u\")" -# Special chars '"', '$', and '\' must be escaped as '\\"', '\\$', and '\\\\'. -Exec=sh -c "u=\\$(echo \\"\\$1\\" | sed 's/[\\\\\\"]/\\\\\\\\&/g'); exec emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" --eval \\"(message-mailto \\\\\\"\\$u\\\\\\")\\"" sh %u +Exec=emacsclient --alternate-editor= --eval '(message-mailto (pop server-eval-args-left))' %u Icon=emacs Name=Emacs (Mail, Client) MimeType=x-scheme-handler/mailto; @@ -16,7 +13,7 @@ Actions=new-window;new-instance; [Desktop Action new-window] Name=New Window -Exec=sh -c "u=\\$(echo \\"\\$1\\" | sed 's/[\\\\\\"]/\\\\\\\\&/g'); exec emacsclient --alternate-editor= --create-frame --eval \\"(message-mailto \\\\\\"\\$u\\\\\\")\\"" sh %u +Exec=emacsclient --alternate-editor= --create-frame --eval '(message-mailto (pop server-eval-args-left))' %u [Desktop Action new-instance] Name=New Instance diff --git a/lisp/server.el b/lisp/server.el index c3325e5a24c..6eff6ebe140 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1165,7 +1165,7 @@ server-process-filter (when prev (setq string (concat prev string)) (process-put proc 'previous-string nil))) - (condition-case err + (condition-case-unless-debug err (progn (server-add-client proc) ;; Send our pid @@ -1189,6 +1189,7 @@ server-process-filter parent-id ; Window ID for XEmbed dontkill ; t if client should not be killed. commands + evalexprs dir use-current-frame frame-parameters ;parameters for newly created frame @@ -1319,8 +1320,7 @@ server-process-filter (let ((expr (pop args-left))) (if coding-system (setq expr (decode-coding-string expr coding-system))) - (push (lambda () (server-eval-and-print expr proc)) - commands) + (push expr evalexprs) (setq filepos nil))) ;; -env NAME=VALUE: An environment variable. @@ -1345,7 +1345,7 @@ server-process-filter ;; arguments, use an existing frame. (and nowait (not (eq tty-name 'window-system)) - (or files commands) + (or files commands evalexprs) (setq use-current-frame t)) (setq frame @@ -1394,7 +1394,7 @@ server-process-filter (let ((default-directory (if (and dir (file-directory-p dir)) dir default-directory))) - (server-execute proc files nowait commands + (server-execute proc files nowait commands evalexprs dontkill frame tty-name))))) (when (or frame files) @@ -1404,22 +1404,27 @@ server-process-filter ;; condition-case (t (server-return-error proc err)))) -(defun server-execute (proc files nowait commands dontkill frame tty-name) +(defvar server-eval-args-left) + +(defun server-execute (proc files nowait commands evalexprs dontkill frame tty-name) ;; This is run from timers and process-filters, i.e. "asynchronously". ;; But w.r.t the user, this is not really asynchronous since the timer ;; is run after 0s and the process-filter is run in response to the ;; user running `emacsclient'. So it is OK to override the - ;; inhibit-quit flag, which is good since `commands' (as well as + ;; inhibit-quit flag, which is good since `evalexprs' (as well as ;; find-file-noselect via the major-mode) can run arbitrary code, ;; including code that needs to wait. (with-local-quit (condition-case err (let ((buffers (server-visit-files files proc nowait))) (mapc 'funcall (nreverse commands)) + (let ((server-eval-args-left (nreverse evalexprs))) + (while server-eval-args-left + (server-eval-and-print (pop server-eval-args-left) proc))) ;; If we were told only to open a new client, obey ;; `initial-buffer-choice' if it specifies a file ;; or a function. - (unless (or files commands) + (unless (or files commands evalexprs) (let ((buf (cond ((stringp initial-buffer-choice) (find-file-noselect initial-buffer-choice)) -- 2.41.0 --=-=-=--