[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#24218: 25.1.50; server-name, server-socket-dir and daemon start thro
|
From: |
Matthew Leach |
|
Subject: |
bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket |
|
Date: |
Thu, 25 Jan 2018 19:34:03 +0000 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
Paul Eggert <eggert@cs.ucla.edu> writes:
> On 01/09/2018 11:53 AM, Matthew Leach wrote:
>> May I suggest `internal--daemon-sockname'?
>
> Yes, that sounds good. Can you prepare a patch along those lines?
> Sorry, I lost track of this bug report. It'd be nice if you could
> re-propose a self-contained set of patches that address all the issues
> raised so far. Thanks.
Sure, please see the attached patch series.
Thanks,
--
Matt
>From e098a2dd17bf9a0701a58f2321c369380d81254e Mon Sep 17 00:00:00 2001
From: Matthew Leach <matthew@mattleach.net>
Date: Sun, 7 Jan 2018 13:47:12 -0800
Subject: [PATCH 1/4] Fix `server-name' and `server-socket-dir' for (Bug#24218)
* lisp/server.el: (server-external-socket-initialised): New
(server-name): Compute server name from `get-external-sockname'.
(server-socket-dir): Compute socket dir from
`get-external-sockname'.
(server-start): Don't check for existing server when an
uninitialised external socket has been passed to Emacs.
* src/emacs.c: (main): Obtain socket name via getsockname and pass
to `init_process_emacs'.
* src/lisp.h: (init_process_emacs): Add second parameter.
* src/process.c: (external_sock_name): New.
(get-external-sockname): New.
(init_process_emacs): Set `external_sock_name' to `sockname'
parameter.
---
lisp/server.el | 56 ++++++++++++++++++++++++++++++++++++--------------------
src/emacs.c | 16 +++++++++++++---
src/lisp.h | 2 +-
src/process.c | 19 ++++++++++++++++++-
4 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/lisp/server.el b/lisp/server.el
index ac0d701851..e8b53530c9 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -251,8 +251,16 @@ server-existing-buffer
are done with it in the server.")
(make-variable-buffer-local 'server-existing-buffer)
-;;;###autoload
-(defcustom server-name "server"
+(defvar server-external-socket-initialised nil
+ "When an external socket is passed into Emacs, we need to call
+`server-start' in order to initialise the connection. This flag
+prevents multiple initialisations when an external socket has
+been consumed.")
+
+(defcustom server-name
+ (if (get-external-sockname)
+ (file-name-nondirectory (get-external-sockname))
+ "server")
"The name of the Emacs server, if this Emacs process creates one.
The command `server-start' makes use of this. It should not be
changed while a server is running."
@@ -263,8 +271,10 @@ server-name
;; We do not use `temporary-file-directory' here, because emacsclient
;; does not read the init file.
(defvar server-socket-dir
- (and (featurep 'make-network-process '(:family local))
- (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid)))
+ (if (get-external-sockname)
+ (file-name-directory (get-external-sockname))
+ (and (featurep 'make-network-process '(:family local))
+ (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid))))
"The directory in which to place the server socket.
If local sockets are not supported, this is nil.")
@@ -618,23 +628,29 @@ server-start
(when server-process
;; kill it dead!
(ignore-errors (delete-process server-process)))
- ;; Delete the socket files made by previous server invocations.
- (if (not (eq t (server-running-p server-name)))
- ;; Remove any leftover socket or authentication file
- (ignore-errors
- (let (delete-by-moving-to-trash)
- (delete-file server-file)))
- (setq server-mode nil) ;; already set by the minor mode code
- (display-warning
- 'server
- (concat "Unable to start the Emacs server.\n"
- (format "There is an existing Emacs server, named %S.\n"
- server-name)
- (substitute-command-keys
- "To start the server in this Emacs process, stop the existing
+ ;; Check to see if an uninitialised external socket has been
+ ;; passed in, if that is the case, skip checking
+ ;; `server-running-p' as this will return the wrong result.
+ (if (and (get-external-sockname)
+ (not server-external-socket-initialised))
+ (setq server-external-socket-initialised t)
+ ;; Delete the socket files made by previous server invocations.
+ (if (not (eq t (server-running-p server-name)))
+ ;; Remove any leftover socket or authentication file
+ (ignore-errors
+ (let (delete-by-moving-to-trash)
+ (delete-file server-file)))
+ (setq server-mode nil) ;; already set by the minor mode code
+ (display-warning
+ 'server
+ (concat "Unable to start the Emacs server.\n"
+ (format "There is an existing Emacs server, named %S.\n"
+ server-name)
+ (substitute-command-keys
+ "To start the server in this Emacs process, stop the
existing
server or call `\\[server-force-delete]' to forcibly disconnect it."))
- :warning)
- (setq leave-dead t))
+ :warning)
+ (setq leave-dead t)))
;; If this Emacs already had a server, clear out associated status.
(while server-clients
(server-delete-client (car server-clients)))
diff --git a/src/emacs.c b/src/emacs.c
index 20ced26283..1af09166b6 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -60,6 +60,7 @@ along with GNU Emacs. If not, see
<https://www.gnu.org/licenses/>. */
#ifdef HAVE_LIBSYSTEMD
# include <systemd/sd-daemon.h>
# include <sys/socket.h>
+# include <sys/un.h>
#endif
#ifdef HAVE_WINDOW_SYSTEM
@@ -1002,6 +1003,7 @@ main (int argc, char **argv)
int sockfd = -1;
+ char *sockname = NULL;
if (argmatch (argv, argc, "-fg-daemon", "--fg-daemon", 10, NULL, &skip_args)
|| argmatch (argv, argc, "-fg-daemon", "--fg-daemon", 10, &dname_arg,
&skip_args))
@@ -1061,8 +1063,16 @@ main (int argc, char **argv)
"Try 'Accept=false' in the Emacs socket unit file.\n"));
else if (systemd_socket == 1
&& (0 < sd_is_socket (SD_LISTEN_FDS_START,
- AF_UNSPEC, SOCK_STREAM, 1)))
- sockfd = SD_LISTEN_FDS_START;
+ AF_UNIX, SOCK_STREAM, 1)))
+ {
+ struct sockaddr_un sockaddr;
+ socklen_t sockaddr_sz = sizeof(sockaddr);
+
+ sockfd = SD_LISTEN_FDS_START;
+
+ if (!getsockname(sockfd, &sockaddr, &sockaddr_sz))
+ sockname = strdup(sockaddr.sun_path);
+ }
#endif /* HAVE_LIBSYSTEMD */
#ifdef USE_GTK
@@ -1656,7 +1666,7 @@ Using an Emacs configured with --with-x-toolkit=lucid
does not have this problem
/* This can create a thread that may call getenv, so it must follow
all calls to putenv and setenv. Also, this sets up
add_keyboard_wait_descriptor, which init_display uses. */
- init_process_emacs (sockfd);
+ init_process_emacs (sockfd, sockname);
init_keyboard (); /* This too must precede init_sys_modes. */
if (!noninteractive)
diff --git a/src/lisp.h b/src/lisp.h
index 3eb6e0d3c1..2e9002a226 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4313,7 +4313,7 @@ extern void delete_keyboard_wait_descriptor (int);
extern void add_gpm_wait_descriptor (int);
extern void delete_gpm_wait_descriptor (int);
#endif
-extern void init_process_emacs (int);
+extern void init_process_emacs (int, char *);
extern void syms_of_process (void);
extern void setup_process_coding_systems (Lisp_Object);
diff --git a/src/process.c b/src/process.c
index d4440e472d..da8e5714b0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -276,6 +276,10 @@ static int max_desc;
the file descriptor of a socket that is already bound. */
static int external_sock_fd;
+/* The name (path) of the socket that was passed to Emacs, when
+ `external_sock_fd' is not -1. */
+static const char *external_sock_name = NULL;
+
/* Indexed by descriptor, gives the process (if any) for that descriptor. */
static Lisp_Object chan_process[FD_SETSIZE];
static void wait_for_socket_fds (Lisp_Object, char const *);
@@ -7974,10 +7978,21 @@ restore_nofile_limit (void)
}
+DEFUN ("get-external-sockname", Fget_external_sockname,
Sget_external_sockname, 0, 0, 0,
+ doc: /* Return the path of an external socket passed to Emacs.
+Otherwise return nil. */)
+ (void)
+{
+ if (external_sock_name)
+ return make_string(external_sock_name, strlen(external_sock_name));
+ else
+ return Qnil;
+}
+
/* This is not called "init_process" because that is the name of a
Mach system call, so it would cause problems on Darwin systems. */
void
-init_process_emacs (int sockfd)
+init_process_emacs (int sockfd, char *sockname)
{
#ifdef subprocesses
int i;
@@ -8012,6 +8027,7 @@ init_process_emacs (int sockfd)
#endif
external_sock_fd = sockfd;
+ external_sock_name = sockname;
max_desc = -1;
memset (fd_callback_info, 0, sizeof (fd_callback_info));
@@ -8306,4 +8322,5 @@ returns non-`nil'. */);
defsubr (&Sprocess_inherit_coding_system_flag);
defsubr (&Slist_system_processes);
defsubr (&Sprocess_attributes);
+ defsubr (&Sget_external_sockname);
}
--
2.16.1
>From a4872a8e24027a0c8cc925140c3d3cda95c096e1 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 7 Jan 2018 13:47:12 -0800
Subject: [PATCH 2/4] Minor cleanups for server-name fix (Bug#24218)
* lisp/server.el (server--external-socket-initialized): Rename
from server-external-socket-initialised, since it should be
private and Emacs uses American spelling. All uses changed.
* src/emacs.c, src/lisp.h: Revert previous changes, as the
initialization is now done in src/process.c, which already
includes the relevant files.
* src/process.c (union u_sockaddr): Move decl to top level.
(external_sock_name, Fget_external_sockname): Remove, replacing
with Vinternal__external_sockname. All uses changed.
(init_process_emacs): Deduce socket name ourselves rather than
have main.c do it. Use conv_sockaddr_to_lisp instead of doing
it by hand. Conditionalize it on HAVE_GETSOCKNAME.
---
lisp/server.el | 24 ++++++++++++------------
src/emacs.c | 16 +++-------------
src/lisp.h | 2 +-
src/process.c | 58 ++++++++++++++++++++++++++++++----------------------------
4 files changed, 46 insertions(+), 54 deletions(-)
diff --git a/lisp/server.el b/lisp/server.el
index e8b53530c9..c867fde832 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -251,15 +251,15 @@ server-existing-buffer
are done with it in the server.")
(make-variable-buffer-local 'server-existing-buffer)
-(defvar server-external-socket-initialised nil
+(defvar server--external-socket-initialized nil
"When an external socket is passed into Emacs, we need to call
-`server-start' in order to initialise the connection. This flag
-prevents multiple initialisations when an external socket has
+`server-start' in order to initialize the connection. This flag
+prevents multiple initializations when an external socket has
been consumed.")
(defcustom server-name
- (if (get-external-sockname)
- (file-name-nondirectory (get-external-sockname))
+ (if internal--external-sockname
+ (file-name-nondirectory internal--external-sockname)
"server")
"The name of the Emacs server, if this Emacs process creates one.
The command `server-start' makes use of this. It should not be
@@ -271,8 +271,8 @@ server-name
;; We do not use `temporary-file-directory' here, because emacsclient
;; does not read the init file.
(defvar server-socket-dir
- (if (get-external-sockname)
- (file-name-directory (get-external-sockname))
+ (if internal--external-sockname
+ (file-name-directory internal--external-sockname)
(and (featurep 'make-network-process '(:family local))
(format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid))))
"The directory in which to place the server socket.
@@ -628,15 +628,15 @@ server-start
(when server-process
;; kill it dead!
(ignore-errors (delete-process server-process)))
- ;; Check to see if an uninitialised external socket has been
+ ;; Check to see if an uninitialized external socket has been
;; passed in, if that is the case, skip checking
;; `server-running-p' as this will return the wrong result.
- (if (and (get-external-sockname)
- (not server-external-socket-initialised))
- (setq server-external-socket-initialised t)
+ (if (and internal--external-sockname
+ (not server--external-socket-initialized))
+ (setq server--external-socket-initialized t)
;; Delete the socket files made by previous server invocations.
(if (not (eq t (server-running-p server-name)))
- ;; Remove any leftover socket or authentication file
+ ;; Remove any leftover socket or authentication file.
(ignore-errors
(let (delete-by-moving-to-trash)
(delete-file server-file)))
diff --git a/src/emacs.c b/src/emacs.c
index 1af09166b6..20ced26283 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -60,7 +60,6 @@ along with GNU Emacs. If not, see
<https://www.gnu.org/licenses/>. */
#ifdef HAVE_LIBSYSTEMD
# include <systemd/sd-daemon.h>
# include <sys/socket.h>
-# include <sys/un.h>
#endif
#ifdef HAVE_WINDOW_SYSTEM
@@ -1003,7 +1002,6 @@ main (int argc, char **argv)
int sockfd = -1;
- char *sockname = NULL;
if (argmatch (argv, argc, "-fg-daemon", "--fg-daemon", 10, NULL, &skip_args)
|| argmatch (argv, argc, "-fg-daemon", "--fg-daemon", 10, &dname_arg,
&skip_args))
@@ -1063,16 +1061,8 @@ main (int argc, char **argv)
"Try 'Accept=false' in the Emacs socket unit file.\n"));
else if (systemd_socket == 1
&& (0 < sd_is_socket (SD_LISTEN_FDS_START,
- AF_UNIX, SOCK_STREAM, 1)))
- {
- struct sockaddr_un sockaddr;
- socklen_t sockaddr_sz = sizeof(sockaddr);
-
- sockfd = SD_LISTEN_FDS_START;
-
- if (!getsockname(sockfd, &sockaddr, &sockaddr_sz))
- sockname = strdup(sockaddr.sun_path);
- }
+ AF_UNSPEC, SOCK_STREAM, 1)))
+ sockfd = SD_LISTEN_FDS_START;
#endif /* HAVE_LIBSYSTEMD */
#ifdef USE_GTK
@@ -1666,7 +1656,7 @@ Using an Emacs configured with --with-x-toolkit=lucid
does not have this problem
/* This can create a thread that may call getenv, so it must follow
all calls to putenv and setenv. Also, this sets up
add_keyboard_wait_descriptor, which init_display uses. */
- init_process_emacs (sockfd, sockname);
+ init_process_emacs (sockfd);
init_keyboard (); /* This too must precede init_sys_modes. */
if (!noninteractive)
diff --git a/src/lisp.h b/src/lisp.h
index 2e9002a226..3eb6e0d3c1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4313,7 +4313,7 @@ extern void delete_keyboard_wait_descriptor (int);
extern void add_gpm_wait_descriptor (int);
extern void delete_gpm_wait_descriptor (int);
#endif
-extern void init_process_emacs (int, char *);
+extern void init_process_emacs (int);
extern void syms_of_process (void);
extern void setup_process_coding_systems (Lisp_Object);
diff --git a/src/process.c b/src/process.c
index da8e5714b0..2613dd2be0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -160,6 +160,18 @@ static bool kbd_is_on_hold;
when exiting. */
bool inhibit_sentinels;
+union u_sockaddr
+{
+ struct sockaddr sa;
+ struct sockaddr_in in;
+#ifdef AF_INET6
+ struct sockaddr_in6 in6;
+#endif
+#ifdef HAVE_LOCAL_SOCKETS
+ struct sockaddr_un un;
+#endif
+};
+
#ifdef subprocesses
#ifndef SOCK_CLOEXEC
@@ -276,10 +288,6 @@ static int max_desc;
the file descriptor of a socket that is already bound. */
static int external_sock_fd;
-/* The name (path) of the socket that was passed to Emacs, when
- `external_sock_fd' is not -1. */
-static const char *external_sock_name = NULL;
-
/* Indexed by descriptor, gives the process (if any) for that descriptor. */
static Lisp_Object chan_process[FD_SETSIZE];
static void wait_for_socket_fds (Lisp_Object, char const *);
@@ -4679,16 +4687,7 @@ server_accept_connection (Lisp_Object server, int
channel)
struct Lisp_Process *ps = XPROCESS (server);
struct Lisp_Process *p;
int s;
- union u_sockaddr {
- struct sockaddr sa;
- struct sockaddr_in in;
-#ifdef AF_INET6
- struct sockaddr_in6 in6;
-#endif
-#ifdef HAVE_LOCAL_SOCKETS
- struct sockaddr_un un;
-#endif
- } saddr;
+ union u_sockaddr saddr;
socklen_t len = sizeof saddr;
ptrdiff_t count;
@@ -7978,21 +7977,10 @@ restore_nofile_limit (void)
}
-DEFUN ("get-external-sockname", Fget_external_sockname,
Sget_external_sockname, 0, 0, 0,
- doc: /* Return the path of an external socket passed to Emacs.
-Otherwise return nil. */)
- (void)
-{
- if (external_sock_name)
- return make_string(external_sock_name, strlen(external_sock_name));
- else
- return Qnil;
-}
-
/* This is not called "init_process" because that is the name of a
Mach system call, so it would cause problems on Darwin systems. */
void
-init_process_emacs (int sockfd, char *sockname)
+init_process_emacs (int sockfd)
{
#ifdef subprocesses
int i;
@@ -8027,7 +8015,18 @@ init_process_emacs (int sockfd, char *sockname)
#endif
external_sock_fd = sockfd;
- external_sock_name = sockname;
+ Lisp_Object sockname = Qnil;
+# if HAVE_GETSOCKNAME
+ if (0 <= sockfd)
+ {
+ union u_sockaddr sa;
+ socklen_t salen = sizeof sa;
+ if (getsockname (sockfd, &sa.sa, &salen) == 0)
+ sockname = conv_sockaddr_to_lisp (&sa.sa, salen);
+ }
+# endif
+ Vinternal__external_sockname = sockname;
+
max_desc = -1;
memset (fd_callback_info, 0, sizeof (fd_callback_info));
@@ -8220,6 +8219,10 @@ These functions are called in the order of the list,
until one of them
returns non-`nil'. */);
Vinterrupt_process_functions = list1 (Qinternal_default_interrupt_process);
+ DEFVAR_LISP ("internal--external-sockname", Vinternal__external_sockname,
+ doc: /* Name of external socket passed to Emacs, or nil if none.
*/);
+ Vinternal__external_sockname = Qnil;
+
DEFSYM (Qinternal_default_interrupt_process,
"internal-default-interrupt-process");
DEFSYM (Qinterrupt_process_functions, "interrupt-process-functions");
@@ -8322,5 +8325,4 @@ returns non-`nil'. */);
defsubr (&Sprocess_inherit_coding_system_flag);
defsubr (&Slist_system_processes);
defsubr (&Sprocess_attributes);
- defsubr (&Sget_external_sockname);
}
--
2.16.1
>From 6a82f66d62e2669335419815504a276facfe0bf2 Mon Sep 17 00:00:00 2001
From: Matthew Leach <matthew@mattleach.net>
Date: Tue, 9 Jan 2018 19:45:30 +0000
Subject: [PATCH 3/4] Update `server-name' :version & document sockname
(Bug#24218)
* lisp/server.el: (server-name): Update :version tag.
* etc/NEWS: Document that `server-name' and `server-socket-dir'
automatically update.
* doc/misc.texi: (Emacs Server): Likewise.
---
doc/emacs/misc.texi | 5 +++++
etc/NEWS | 3 +++
lisp/server.el | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 633e1e881d..c9b8f08252 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1654,6 +1654,11 @@ Emacs Server
@samp{foo}. The @code{emacsclient} program can specify a server by
name, using the @samp{-s} option (@pxref{emacsclient Options}).
+ If Emacs is passed a socket by an external program --- for example
+by systemd socket activation --- the value of @code{server-name} and
+@code{server-socket-dir} is automatically updated to reflect the name
+and path of the socket.
+
If you want to run multiple Emacs daemons (@pxref{Initial Options}),
you can give each daemon its own server name like this:
diff --git a/etc/NEWS b/etc/NEWS
index f6f36dfc85..66cb0834c5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -194,6 +194,9 @@ as new-style, bind the new variable
'force-new-style-backquotes' to t.
* Lisp Changes in Emacs 27.1
+** The `server-name' and `server-socket-dir' variables are set when a
+socket has been pased to Emacs (Bug#24218).
+
** Internal parsing commands now use syntax-ppss and disregard
open-paren-in-column-0-is-defun-start. This affects mostly things like
forward-comment, scan-sexps, and forward-sexp when parsing backward.
diff --git a/lisp/server.el b/lisp/server.el
index c867fde832..16b3f8e4e2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -266,7 +266,7 @@ server-name
changed while a server is running."
:group 'server
:type 'string
- :version "23.1")
+ :version "27.1")
;; We do not use `temporary-file-directory' here, because emacsclient
;; does not read the init file.
--
2.16.1
>From 6bc1562dfc674df50f4947653be6e1a4cd436ccf Mon Sep 17 00:00:00 2001
From: Matthew Leach <matthew@mattleach.net>
Date: Thu, 25 Jan 2018 19:24:14 +0000
Subject: [PATCH 4/4] Rename internal--external-sockname and document
(Bug#24218)
* lisp/server.el: Rename `internal--external-sockname' to
`internal-daemon-sockname'.
* src/process.c: Likewise.
* doc/lispref/processes.texi: Document `internal-daemon-sockname'.
---
doc/lispref/processes.texi | 17 ++++++++++++++---
lisp/server.el | 10 +++++-----
src/process.c | 6 +++---
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 8a8425cb84..7f078e950f 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2860,9 +2860,9 @@ Network Feature Testing
@node Misc Network
@section Misc Network Facilities
- These additional functions are useful for creating and operating
-on network connections. Note that they are supported only on some
-systems.
+ These additional functions and variables are useful for creating and
+operating on network connections. Note that they are supported only
+on some systems.
@defun network-interface-list
This function returns a list describing the network interfaces
@@ -2911,6 +2911,17 @@ Misc Network
@code{:@var{p}} suffix.
@end defun
+@defvar internal--daemon-sockname
+This variable is set to the full path of the socket that has been
+passed to Emacs during socket activation. This is then used to update
+the @code{server-name} and @code{server-socket-dir} variables to
+reflect the name and path of the socket that was used to launch the
+Emacs daemon process.
+
+If Emacs wasn't started with socket activation, the value of this
+variable is @code{nil}.
+@end defvar
+
@node Serial Ports
@section Communicating with Serial Ports
@cindex @file{/dev/tty}
diff --git a/lisp/server.el b/lisp/server.el
index 16b3f8e4e2..4e0afa26f9 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -258,8 +258,8 @@ server--external-socket-initialized
been consumed.")
(defcustom server-name
- (if internal--external-sockname
- (file-name-nondirectory internal--external-sockname)
+ (if internal-daemon-sockname
+ (file-name-nondirectory internal-daemon-sockname)
"server")
"The name of the Emacs server, if this Emacs process creates one.
The command `server-start' makes use of this. It should not be
@@ -271,8 +271,8 @@ server-name
;; We do not use `temporary-file-directory' here, because emacsclient
;; does not read the init file.
(defvar server-socket-dir
- (if internal--external-sockname
- (file-name-directory internal--external-sockname)
+ (if internal-daemon-sockname
+ (file-name-directory internal-daemon-sockname)
(and (featurep 'make-network-process '(:family local))
(format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid))))
"The directory in which to place the server socket.
@@ -631,7 +631,7 @@ server-start
;; Check to see if an uninitialized external socket has been
;; passed in, if that is the case, skip checking
;; `server-running-p' as this will return the wrong result.
- (if (and internal--external-sockname
+ (if (and internal-daemon-sockname
(not server--external-socket-initialized))
(setq server--external-socket-initialized t)
;; Delete the socket files made by previous server invocations.
diff --git a/src/process.c b/src/process.c
index 2613dd2be0..48854e24b4 100644
--- a/src/process.c
+++ b/src/process.c
@@ -8025,7 +8025,7 @@ init_process_emacs (int sockfd)
sockname = conv_sockaddr_to_lisp (&sa.sa, salen);
}
# endif
- Vinternal__external_sockname = sockname;
+ Vinternal_daemon_sockname = sockname;
max_desc = -1;
memset (fd_callback_info, 0, sizeof (fd_callback_info));
@@ -8219,9 +8219,9 @@ These functions are called in the order of the list,
until one of them
returns non-`nil'. */);
Vinterrupt_process_functions = list1 (Qinternal_default_interrupt_process);
- DEFVAR_LISP ("internal--external-sockname", Vinternal__external_sockname,
+ DEFVAR_LISP ("internal-daemon-sockname", Vinternal_daemon_sockname,
doc: /* Name of external socket passed to Emacs, or nil if none.
*/);
- Vinternal__external_sockname = Qnil;
+ Vinternal_daemon_sockname = Qnil;
DEFSYM (Qinternal_default_interrupt_process,
"internal-default-interrupt-process");
--
2.16.1
- bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Paul Eggert, 2018/01/07
- bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Eli Zaretskii, 2018/01/07
- bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Paul Eggert, 2018/01/07
- bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Eli Zaretskii, 2018/01/08
- bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Paul Eggert, 2018/01/08
- bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Eli Zaretskii, 2018/01/08
- bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Paul Eggert, 2018/01/08
bug#24218: 25.1.50; server-name, server-socket-dir and daemon start through, systemd socket, Matthew Leach, 2018/01/09