mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

fix comments in last change

Browse Source
This commit is contained in:
Adrian Robert 2009-01-23 14:53:11 +00:00
parent 27521ca69b
commit cfa6accb56
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/emacs.c
View File

@ -1117,9 +1117,10 @@ main (int argc, char **argv)
#ifndef NS_IMPL_COCOA #ifndef NS_IMPL_COCOA
f = fork (); f = fork ();
#else #else /* NS_IMPL_COCOA */
/* Under Cocoa we must do fork+exec: /* Under Cocoa we must do fork+exec as CoreFoundation lib fails in
(http://developer.apple.com/ReleaseNotes/CoreFoundation/CoreFoundation.html) forked process: http://developer.apple.com/ReleaseNotes/
CoreFoundation/CoreFoundation.html)
We mark being in the exec'd process by a daemon name argument of We mark being in the exec'd process by a daemon name argument of
form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors, form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors,
NAME is the original daemon name, if any. */ NAME is the original daemon name, if any. */
@ -1127,7 +1128,7 @@ main (int argc, char **argv)
f = fork (); /* in orig */ f = fork (); /* in orig */
else else
f = 0; /* in exec'd */ f = 0; /* in exec'd */
#endif #endif /* NS_IMPL_COCOA */
if (f > 0) if (f > 0)
{ {
int retval; int retval;
@ -1165,9 +1166,9 @@ main (int argc, char **argv)
#ifdef NS_IMPL_COCOA #ifdef NS_IMPL_COCOA
{ {
/* in orig process, forked as child, OR in exec'd */ /* In orig process, forked as child, OR in exec'd. */
if (!dname_arg || !strchr (dname_arg, '\n')) if (!dname_arg || !strchr (dname_arg, '\n'))
{ /* in orig, child: now exec w/special daemon name */ { /* In orig, child: now exec w/special daemon name. */
char fdStr[80]; char fdStr[80];
if (dname_arg && strlen (dname_arg) > 70) if (dname_arg && strlen (dname_arg) > 70)
@ -1185,7 +1186,7 @@ main (int argc, char **argv)
exit (1); exit (1);
} }
/* in exec'd: parse special dname into pipe and name info */ /* In exec'd: parse special dname into pipe and name info. */
if (!dname_arg || !strchr (dname_arg, '\n') if (!dname_arg || !strchr (dname_arg, '\n')
|| strlen (dname_arg) < 1 || strlen (dname_arg) > 70) || strlen (dname_arg) < 1 || strlen (dname_arg) > 70)
{ {
@ -1197,7 +1198,7 @@ main (int argc, char **argv)
dname_arg2); dname_arg2);
dname_arg = strlen (dname_arg2) ? dname_arg2 : NULL; dname_arg = strlen (dname_arg2) ? dname_arg2 : NULL;
} }
#endif #endif /* NS_IMPL_COCOA */
if (dname_arg) if (dname_arg)
daemon_name = xstrdup (dname_arg); daemon_name = xstrdup (dname_arg);