[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/emacs.c,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/src/emacs.c,v |
Date: |
Sun, 21 Sep 2008 23:31:52 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/09/21 23:31:48
Index: src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -b -r1.443 -r1.444
--- src/emacs.c 23 Aug 2008 16:45:13 -0000 1.443
+++ src/emacs.c 21 Sep 2008 23:31:48 -0000 1.444
@@ -232,6 +232,9 @@
int noninteractive1;
+/* Nonzero means Emacs was started as a daemon. */
+int is_daemon = 0;
+
/* Save argv and argc. */
char **initial_argv;
int initial_argc;
@@ -1068,6 +1071,34 @@
exit (0);
}
+#ifndef DOS_NT
+ if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args))
+ {
+ pid_t f = fork();
+ int nfd;
+ if (f > 0)
+ exit(0);
+ if (f < 0)
+ {
+ fprintf (stderr, "Cannot fork!\n");
+ exit(1);
+ }
+
+ nfd = open("/dev/null", O_RDWR);
+ dup2(nfd, 0);
+ dup2(nfd, 1);
+ dup2(nfd, 2);
+ close (nfd);
+ is_daemon = 1;
+#ifdef HAVE_SETSID
+ setsid();
+#endif
+ }
+#else /* DOS_NT */
+ fprintf (stderr, "This platform does not support the -daemon flag.\n");
+ exit (1);
+#endif /* DOS_NT */
+
if (! noninteractive)
{
#ifdef BSD_PGRPS
@@ -1719,6 +1750,7 @@
{ "-nw", "--no-windows", 110, 0 },
{ "-batch", "--batch", 100, 0 },
{ "-script", "--script", 100, 1 },
+ { "-daemon", "--daemon", 99, 0 },
{ "-help", "--help", 90, 0 },
{ "-no-unibyte", "--no-unibyte", 83, 0 },
{ "-multibyte", "--multibyte", 82, 0 },
@@ -2350,6 +2382,13 @@
return Fnreverse (lpath);
}
+DEFUN ("daemonp", Fdaemonp, Sdaemonp, 0, 0, 0,
+ doc: /* Make the current emacs process a daemon.*/)
+ (void)
+{
+ return is_daemon ? Qt : Qnil;
+}
+
void
syms_of_emacs ()
{
@@ -2368,6 +2407,7 @@
defsubr (&Sinvocation_name);
defsubr (&Sinvocation_directory);
+ defsubr (&Sdaemonp);
DEFVAR_LISP ("command-line-args", &Vcommand_line_args,
doc: /* Args passed by shell to Emacs, as a list of strings.
- [Emacs-diffs] Changes to emacs/src/emacs.c,v,
Dan Nicolaescu <=