[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated es
From: |
sbaugh |
Subject: |
bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping |
Date: |
Thu, 14 Sep 2023 11:18:13 +0000 (UTC) |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Here's a revised patch which drops adding the argument to Emacs itself;
it only adds an argument to emacsclient.
>From d4558462598eaa33466b3b2fb1dbcc26ea877ede Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Thu, 14 Sep 2023 07:12:22 -0400
Subject: [PATCH] Add --apply argument to emacsclient to avoid escaping
Passing arguments to functions through emacsclient --eval requires
complicated escaping (as seen in emacsclient-mail.desktop before this
change).
The new --apply argument for emacsclient passes command line arguments
as uninterpreted strings to the specified function. This simplifies
use cases where arbitrary input needs to be passed to Emacs.
org-protocol will be able to use this as well, which will allow it to
eventually drop its current advice on server-visit-files.
* etc/emacsclient-mail.desktop: Use --apply. (bug#65902)
* lib-src/emacsclient.c (longopts, decode_options, main): Add support
for --apply.
* lisp/server.el (server-apply-and-print): Add.
(server-process-filter): Add support for -apply and -applyargs
---
etc/emacsclient-mail.desktop | 7 ++-----
lib-src/emacsclient.c | 36 ++++++++++++++++++++++++++++++++++--
lisp/server.el | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/etc/emacsclient-mail.desktop b/etc/emacsclient-mail.desktop
index 0a2420ddead..ea0690bacd9 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= --apply message-mailto -- %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 --apply message-mailto --
%u
[Desktop Action new-instance]
Name=New Instance
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 698bf9b50ae..159c22d1ae9 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -116,6 +116,9 @@ #define DEFAULT_TIMEOUT (30)
/* True means args are expressions to be evaluated. --eval. */
static bool eval;
+/* The function to call. Other arguments are passed as strings. --apply. */
+static char *apply;
+
/* True means open a new frame. --create-frame etc. */
static bool create_frame;
@@ -169,6 +172,7 @@ #define DEFAULT_TIMEOUT (30)
{ "quiet", no_argument, NULL, 'q' },
{ "suppress-output", no_argument, NULL, 'u' },
{ "eval", no_argument, NULL, 'e' },
+ { "apply", required_argument, NULL, 'y' },
{ "help", no_argument, NULL, 'H' },
{ "version", no_argument, NULL, 'V' },
{ "tty", no_argument, NULL, 't' },
@@ -552,6 +556,10 @@ decode_options (int argc, char **argv)
eval = true;
break;
+ case 'y':
+ apply = optarg;
+ break;
+
case 'q':
quiet = true;
break;
@@ -690,6 +698,7 @@ print_help_and_exit (void)
-F ALIST, --frame-parameters=ALIST\n\
Set the parameters of a new frame\n\
-e, --eval Evaluate the FILE arguments as ELisp expressions\n\
+-y, --apply FUNC Call ELisp FUNC, passing all FILE arguments as
strings\n\
-n, --no-wait Don't wait for the server to return\n\
-w, --timeout=SECONDS Seconds to wait before timing out\n\
-q, --quiet Don't display messages on success\n\
@@ -1953,7 +1962,7 @@ main (int argc, char **argv)
/* Process options. */
decode_options (argc, argv);
- if (! (optind < argc || eval || create_frame))
+ if (! (optind < argc || eval || apply || create_frame))
{
message (true, ("%s: file name or argument required\n"
"Try '%s --help' for more information\n"),
@@ -1961,6 +1970,14 @@ main (int argc, char **argv)
exit (EXIT_FAILURE);
}
+ if (eval && apply)
+ {
+ message (true, ("%s: can't pass both --eval and --apply\n"
+ "Try '%s --help' for more information\n"),
+ progname, progname);
+ exit (EXIT_FAILURE);
+ }
+
#ifdef SOCKETS_IN_FILE_SYSTEM
if (tty)
{
@@ -2080,6 +2097,13 @@ main (int argc, char **argv)
send_to_emacs (emacs_socket, " ");
continue;
}
+ else if (apply)
+ {
+ send_to_emacs (emacs_socket, "-applyarg ");
+ quote_argument (emacs_socket, argv[i]);
+ send_to_emacs (emacs_socket, " ");
+ continue;
+ }
char *p = argv[i];
if (*p == '+')
@@ -2136,10 +2160,18 @@ main (int argc, char **argv)
send_to_emacs (emacs_socket, " ");
}
+ if (apply)
+ {
+ send_to_emacs (emacs_socket, "-apply ");
+ quote_argument (emacs_socket, apply);
+ send_to_emacs (emacs_socket, " ");
+ }
+
+
send_to_emacs (emacs_socket, "\n");
/* Wait for an answer. */
- if (!eval && !tty && !nowait && !quiet && 0 <= process_grouping ())
+ if (!eval && !apply && !tty && !nowait && !quiet && 0 <= process_grouping ())
{
printf ("Waiting for Emacs...");
skiplf = false;
diff --git a/lisp/server.el b/lisp/server.el
index c3325e5a24c..5981e90625d 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -873,6 +873,17 @@ server-eval-and-print
(point-min) (point-max))))
(server-reply-print (server-quote-arg text) proc)))))))
+(defun server-apply-and-print (func args proc)
+ "Call FUNC on ARGS and send the result back to client PROC."
+ (let ((v (with-local-quit (eval (apply (intern func) args) t))))
+ (when proc
+ (with-temp-buffer
+ (let ((standard-output (current-buffer)))
+ (pp v)
+ (let ((text (buffer-substring-no-properties
+ (point-min) (point-max))))
+ (server-reply-print (server-quote-arg text) proc)))))))
+
(defconst server-msg-size 1024
"Maximum size of a message sent to a client.")
@@ -1196,6 +1207,7 @@ server-process-filter
tty-type ; string.
files
filepos
+ applyargs
args-left)
;; Remove this line from STRING.
(setq string (substring string (match-end 0)))
@@ -1323,6 +1335,28 @@ server-process-filter
commands)
(setq filepos nil)))
+ ;; -apply FUNC: Call a function on arguments.
+ ("-apply"
+ (if use-current-frame
+ (setq use-current-frame 'always))
+ (let ((func (pop args-left)))
+ (if coding-system
+ (setq func (decode-coding-string func coding-system)))
+ (push (lambda () (server-apply-and-print func applyargs
proc))
+ commands)
+ (setq applyargs nil)
+ (setq filepos nil)))
+
+ ;; -applyarg ARG: Add an argument for later -apply.
+ ("-applyarg"
+ (if use-current-frame
+ (setq use-current-frame 'always))
+ (let ((arg (pop args-left)))
+ (if coding-system
+ (setq arg (decode-coding-string arg coding-system)))
+ (push arg applyargs)
+ (setq filepos nil)))
+
;; -env NAME=VALUE: An environment variable.
("-env"
(let ((var (pop args-left)))
--
2.41.0
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, (continued)
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Andreas Schwab, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Spencer Baugh, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Jim Porter, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Jim Porter, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Spencer Baugh, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Jim Porter, 2023/09/13
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, sbaugh, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping,
sbaugh <=
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, sbaugh, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Spencer Baugh, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Spencer Baugh, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Spencer Baugh, 2023/09/14
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/15
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, sbaugh, 2023/09/21
- bug#65902: 29.0.92; emacsclient-mail.desktop fails due to complicated escaping, Eli Zaretskii, 2023/09/22