[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#1058: 23.0.60; emacs --daemon should not return until socket is read
From: |
Dan Nicolaescu |
Subject: |
bug#1058: 23.0.60; emacs --daemon should not return until socket is ready |
Date: |
Sun, 12 Oct 2008 19:03:40 -0700 (PDT) |
Here's a patch that adds support for --daemon=SERVER_NAME
Using --daemon=SERVER_NAME for scripts is much nicer than:
--daemon --eval '(setq server-name "SERVER_NAME")'
So IMVHO something like this could go in now...
Index: lisp/server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.168
diff -u -3 -p -r1.168 server.el
--- lisp/server.el 24 Sep 2008 20:12:02 -0000 1.168
+++ lisp/server.el 13 Oct 2008 00:15:28 -0000
@@ -446,7 +446,7 @@ Creates the directory if necessary and m
(error "The directory %s is unsafe" dir))))
;;;###autoload
-(defun server-start (&optional leave-dead)
+(defun server-start (&optional leave-dead server-arg)
"Allow this Emacs process to be a server for client processes.
This starts a server communications subprocess through which
client \"editors\" can send your editing commands to this Emacs
@@ -463,6 +463,8 @@ kill any existing server communications
(when server-process
;; kill it dead!
(ignore-errors (delete-process server-process)))
+ (when (stringp server-arg)
+ (setq server-name server-arg))
;; Delete the socket files made by previous server invocations.
(condition-case ()
(delete-file (expand-file-name server-name server-socket-dir))
Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.513
diff -u -3 -p -r1.513 startup.el
--- lisp/startup.el 12 Oct 2008 16:59:01 -0000 1.513
+++ lisp/startup.el 13 Oct 2008 00:15:28 -0000
@@ -1212,8 +1212,8 @@ the `--debug-init' option to view a comp
;; This is done after loading the user's init file and after
;; processing all command line arguments to allow e.g. `server-name'
;; to be changed before the server starts.
- (when (daemonp)
- (server-start))
+ (let ((dn (daemonp)))
+ (when dn (server-start nil dn)))
;; Run emacs-session-restore (session management) if started by
;; the session manager and we have a session manager connection.
Index: src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.448
diff -u -3 -p -r1.448 emacs.c
--- src/emacs.c 6 Oct 2008 16:16:56 -0000 1.448
+++ src/emacs.c 13 Oct 2008 00:15:28 -0000
@@ -237,6 +237,8 @@ int noninteractive1;
/* Nonzero means Emacs was started as a daemon. */
int is_daemon = 0;
+/* Name for the server started by the daemon.*/
+static char *daemon_name;
/* Save argv and argc. */
char **initial_argv;
@@ -792,6 +794,7 @@ main (int argc, char **argv)
#endif
int no_loadup = 0;
char *junk = 0;
+ char *dname_arg = 0;
#if GC_MARK_STACK
extern Lisp_Object *stack_base;
@@ -1074,8 +1077,8 @@ main (int argc, char **argv)
printf (USAGE4, bug_reporting_address ());
exit (0);
}
-
- if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args))
+ if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args)
+ || argmatch (argv, argc, "-daemon", "--daemon", 5, &dname_arg,
&skip_args))
{
#ifndef DOS_NT
pid_t f = fork ();
@@ -1088,6 +1091,8 @@ main (int argc, char **argv)
exit (1);
}
+ if (dname_arg)
+ daemon_name = xstrdup (dname_arg);
nfd = open ("/dev/null", O_RDWR);
dup2 (nfd, 0);
dup2 (nfd, 1);
@@ -2387,10 +2392,17 @@ decode_env_path (evarname, defalt)
}
DEFUN ("daemonp", Fdaemonp, Sdaemonp, 0, 0, 0,
- doc: /* Return t if the current emacs process is a daemon. */)
+ doc: /* Return non-nil if the current emacs process is a daemon.
+If the daemon was give a name argument, return that name. */)
()
{
- return is_daemon ? Qt : Qnil;
+ if (is_daemon)
+ if (daemon_name)
+ return build_string (daemon_name);
+ else
+ return Qt;
+ else
+ return Qnil;
}
void
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, (continued)
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Stefan Monnier, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Stefan Monnier, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Trent W. Buck, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Stefan Monnier, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/03
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Stefan Monnier, 2008/10/03
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/03
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready,
Dan Nicolaescu <=
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Stefan Monnier, 2008/10/13
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/13
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Stefan Monnier, 2008/10/13
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/14
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/27
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Trent W. Buck, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Romain Francoise, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/02
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Dan Nicolaescu, 2008/10/06
- bug#1058: 23.0.60; emacs --daemon should not return until socket is ready, Stefan Monnier, 2008/10/07