--- Libc/Libc-498/threads/cprocs.c
+++ Libc/Libc-262/threads/cprocs.c
@@ -3,20 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -44,8 +43,8 @@
  * Implementation of cprocs (lightweight processes)
  * and primitive synchronization operations.
  */
+#include <stdlib.h>
 #include "pthread_internals.h"
-#include <stdlib.h>
 #include "cthreads.h"
 #include "cthread_internals.h"
 #include <mach/message.h>
@@ -61,6 +60,8 @@
  */
 extern mach_port_t mach_thread_self();
 extern boolean_t swtch_pri();
+
+private int cprocs_started = FALSE;
 
 #ifdef	CTHREADS_DEBUG
 private void
@@ -96,11 +97,12 @@
 	cthread_queue_map(queue, cproc_t, print_cproc);
 	printf("\n");
 }
-#endif	/* CTHREADS_DEBUG */
+#endif	CTHREADS_DEBUG
+
+private int cproc_lock = 0;		/* unlocked */
+private cproc_t cprocs = NO_CPROC;	/* linked list of cprocs */
 
 #ifdef	CTHREADS_DEBUG
-private cproc_t cprocs = NO_CPROC;	/* linked list of cprocs */
-
 private void
 print_all_cprocs()
 {
@@ -111,14 +113,13 @@
 		print_cproc(p);
 	printf("\n");
 }
-#endif	/* CTHREADS_DEBUG */
+#endif	CTHREADS_DEBUG
 
 /*
  * Routines for supporting fork() of multi-threaded programs.
  */
 
-void
-_cproc_fork_child()
+void _cproc_fork_child()
 /*
  * Called in the child after a fork().  Resets cproc data structures to
  * coincide with the reality that we now have a single cproc and cthread.
@@ -136,21 +137,15 @@
 
 #undef errno
 extern int errno;
-extern int *__error(void);
-
-void
-cthread_set_errno_self(error)
+void cthread_set_errno_self(error)
 	int	error;
 {
-	int *ep = __error();
-	extern int __unix_conforming;
+	pthread_t t;
 
-	if ((__unix_conforming) && (error == EINTR) && (__pthread_canceled(0) == 0))
-		pthread_exit(PTHREAD_CANCELED);
-
-        if (ep != &errno)
-            *ep = error;
-
+	t = pthread_self();
+        if (t && (t->sig == _PTHREAD_SIG)) {
+            t->err_no = error;
+        }
         errno = error;
 }