aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Robert2009-01-23 14:53:11 +0000
committerAdrian Robert2009-01-23 14:53:11 +0000
commitcfa6accb567f30c999dd97e12eb66b1355ca790b (patch)
tree927b7a800cd288bbf3a36a1e691b5ff3c4a0c1fa /src
parent27521ca69b159cd00f362b315f9351b72195cd5a (diff)
downloademacs-cfa6accb567f30c999dd97e12eb66b1355ca790b.tar.gz
emacs-cfa6accb567f30c999dd97e12eb66b1355ca790b.zip
fix comments in last change
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 1b4872bf4c9..c4025218991 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1117,9 +1117,10 @@ main (int argc, char **argv)
1117 1117
1118#ifndef NS_IMPL_COCOA 1118#ifndef NS_IMPL_COCOA
1119 f = fork (); 1119 f = fork ();
1120#else 1120#else /* NS_IMPL_COCOA */
1121 /* Under Cocoa we must do fork+exec: 1121 /* Under Cocoa we must do fork+exec as CoreFoundation lib fails in
1122 (http://developer.apple.com/ReleaseNotes/CoreFoundation/CoreFoundation.html) 1122 forked process: http://developer.apple.com/ReleaseNotes/
1123 CoreFoundation/CoreFoundation.html)
1123 We mark being in the exec'd process by a daemon name argument of 1124 We mark being in the exec'd process by a daemon name argument of
1124 form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors, 1125 form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors,
1125 NAME is the original daemon name, if any. */ 1126 NAME is the original daemon name, if any. */
@@ -1127,7 +1128,7 @@ main (int argc, char **argv)
1127 f = fork (); /* in orig */ 1128 f = fork (); /* in orig */
1128 else 1129 else
1129 f = 0; /* in exec'd */ 1130 f = 0; /* in exec'd */
1130#endif 1131#endif /* NS_IMPL_COCOA */
1131 if (f > 0) 1132 if (f > 0)
1132 { 1133 {
1133 int retval; 1134 int retval;
@@ -1165,9 +1166,9 @@ main (int argc, char **argv)
1165 1166
1166#ifdef NS_IMPL_COCOA 1167#ifdef NS_IMPL_COCOA
1167 { 1168 {
1168 /* in orig process, forked as child, OR in exec'd */ 1169 /* In orig process, forked as child, OR in exec'd. */
1169 if (!dname_arg || !strchr (dname_arg, '\n')) 1170 if (!dname_arg || !strchr (dname_arg, '\n'))
1170 { /* in orig, child: now exec w/special daemon name */ 1171 { /* In orig, child: now exec w/special daemon name. */
1171 char fdStr[80]; 1172 char fdStr[80];
1172 1173
1173 if (dname_arg && strlen (dname_arg) > 70) 1174 if (dname_arg && strlen (dname_arg) > 70)
@@ -1185,7 +1186,7 @@ main (int argc, char **argv)
1185 exit (1); 1186 exit (1);
1186 } 1187 }
1187 1188
1188 /* in exec'd: parse special dname into pipe and name info */ 1189 /* In exec'd: parse special dname into pipe and name info. */
1189 if (!dname_arg || !strchr (dname_arg, '\n') 1190 if (!dname_arg || !strchr (dname_arg, '\n')
1190 || strlen (dname_arg) < 1 || strlen (dname_arg) > 70) 1191 || strlen (dname_arg) < 1 || strlen (dname_arg) > 70)
1191 { 1192 {
@@ -1197,7 +1198,7 @@ main (int argc, char **argv)
1197 dname_arg2); 1198 dname_arg2);
1198 dname_arg = strlen (dname_arg2) ? dname_arg2 : NULL; 1199 dname_arg = strlen (dname_arg2) ? dname_arg2 : NULL;
1199 } 1200 }
1200#endif 1201#endif /* NS_IMPL_COCOA */
1201 1202
1202 if (dname_arg) 1203 if (dname_arg)
1203 daemon_name = xstrdup (dname_arg); 1204 daemon_name = xstrdup (dname_arg);