procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* emacs.c (Fdaemonp): Doc fix.

Browse source
This commit is contained in:
Juanma Barranquero 2008-09-22 15:21:40 +00:00
parent 9d29095c13
commit 9d0a6e4205
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,6 +1,10 @@
2008-09-22 Juanma Barranquero <lekktu@gmail.com>
* emacs.c (Fdaemonp): Doc fix.
2008-09-22 Dan Nicolaescu <dann@ics.uci.edu>
* emacs.c (main): Place #ifdef.in the proper place.
* emacs.c (main): Place #ifdef in the proper place.
2008-09-21 Dan Nicolaescu <dann@ics.uci.edu>

18
src/emacs.c
View file

@ -1074,20 +1074,20 @@ main (int argc, char **argv)
if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args))
{
#ifndef DOS_NT
pid_t f = fork();
pid_t f = fork ();
int nfd;
if (f > 0)
exit(0);
exit (0);
if (f < 0)
{
fprintf (stderr, "Cannot fork!\n");
exit(1);
exit (1);
}
nfd = open("/dev/null", O_RDWR);
dup2(nfd, 0);
dup2(nfd, 1);
dup2(nfd, 2);
nfd = open ("/dev/null", O_RDWR);
dup2 (nfd, 0);
dup2 (nfd, 1);
dup2 (nfd, 2);
close (nfd);
is_daemon = 1;
#ifdef HAVE_SETSID
@ -2383,8 +2383,8 @@ decode_env_path (evarname, defalt)
}
DEFUN ("daemonp", Fdaemonp, Sdaemonp, 0, 0, 0,
doc: /* Make the current emacs process a daemon.*/)
(void)
doc: /* Return t if the current emacs process is a daemon. */)
()
{
return is_daemon ? Qt : Qnil;
}