[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src emacs.c
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src emacs.c |
Date: |
Fri, 23 Jan 2009 14:53:11 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/01/23 14:53:11
Modified files:
src : emacs.c
Log message:
fix comments in last change
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/emacs.c?cvsroot=emacs&r1=1.460&r2=1.461
Patches:
Index: emacs.c
===================================================================
RCS file: /sources/emacs/emacs/src/emacs.c,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -b -r1.460 -r1.461
--- emacs.c 23 Jan 2009 09:58:02 -0000 1.460
+++ emacs.c 23 Jan 2009 14:53:11 -0000 1.461
@@ -1117,9 +1117,10 @@
#ifndef NS_IMPL_COCOA
f = fork ();
-#else
- /* Under Cocoa we must do fork+exec:
- (http://developer.apple.com/ReleaseNotes/CoreFoundation/CoreFoundation.html)
+#else /* NS_IMPL_COCOA */
+ /* Under Cocoa we must do fork+exec as CoreFoundation lib fails in
+ forked process: http://developer.apple.com/ReleaseNotes/
+ CoreFoundation/CoreFoundation.html)
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,
NAME is the original daemon name, if any. */
@@ -1127,7 +1128,7 @@
f = fork (); /* in orig */
else
f = 0; /* in exec'd */
-#endif
+#endif /* NS_IMPL_COCOA */
if (f > 0)
{
int retval;
@@ -1165,9 +1166,9 @@
#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'))
- { /* in orig, child: now exec w/special daemon name */
+ { /* In orig, child: now exec w/special daemon name. */
char fdStr[80];
if (dname_arg && strlen (dname_arg) > 70)
@@ -1185,7 +1186,7 @@
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')
|| strlen (dname_arg) < 1 || strlen (dname_arg) > 70)
{
@@ -1197,7 +1198,7 @@
dname_arg2);
dname_arg = strlen (dname_arg2) ? dname_arg2 : NULL;
}
-#endif
+#endif /* NS_IMPL_COCOA */
if (dname_arg)
daemon_name = xstrdup (dname_arg);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src emacs.c,
Adrian Robert <=