From 2ccc3113dde017d3e3a49f98e4672bc69b288850 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Wed, 29 Mar 2017 19:58:58 +0000
Subject: [PATCH] Libsystem-1238.51.1.tar.gz

---
 .gitignore |  8 ++++++++
 init.c     | 43 ++++++++++++++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..66ed0d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# /
+/build
+
+# /Libsystem.xcodeproj/
+/Libsystem.xcodeproj/xcuserdata
+
+# /Libsystem.xcodeproj/project.xcworkspace/
+/Libsystem.xcodeproj/project.xcworkspace/xcuserdata
diff --git a/init.c b/init.c
index e684473..bb49bc2 100644
--- a/init.c
+++ b/init.c
@@ -50,6 +50,7 @@ extern void libdispatch_init(void);		// from libdispatch.dylib
 extern void _libxpc_initializer(void);		// from libxpc.dylib
 extern void _libsecinit_initializer(void);        // from libsecinit.dylib
 extern void _libtrace_init(void);		// from libsystem_trace.dylib
+extern void _container_init(const char *apple[]); // from libsystem_containermanager.dylib
 
 
 // signal malloc stack logging that initialisation has finished
@@ -62,7 +63,9 @@ extern void _pthread_clear_qos_tsd(mach_port_t) __attribute__((weak_import));
 extern void _pthread_fork_prepare(void);
 extern void _pthread_fork_parent(void);
 extern void _pthread_fork_child(void);
-extern void _pthread_fork_child_postinit(void);
+extern void _pthread_atfork_prepare_handlers();
+extern void _pthread_atfork_parent_handlers(void);
+extern void _pthread_atfork_child_handlers(void);
 extern void _pthread_exit_if_canceled(int);
 
 extern void dispatch_atfork_prepare(void);
@@ -162,18 +165,23 @@ libSystem_initializer(int argc,
 	libdispatch_init();
 	_libxpc_initializer();
 
+	// must be initialized after dispatch
+	_libtrace_init();
+
 #if !(TARGET_OS_EMBEDDED || TARGET_OS_SIMULATOR)
 	_libsecinit_initializer();
 #endif
 
+#if TARGET_OS_EMBEDDED
+	_container_init(apple);
+#endif
+
 	__stack_logging_early_finished();
 
 #if TARGET_OS_EMBEDDED && !TARGET_OS_WATCH && !__LP64__
 	_vminterpose_init();
 #endif
 
-	_libtrace_init(); // must be initialized after dispatch
-
 #if !TARGET_OS_IPHONE
     /* <rdar://problem/22139800> - Preserve the old behavior of apple[] for
      * programs that haven't linked against newer SDK.
@@ -196,50 +204,59 @@ libSystem_initializer(int argc,
 
 /*
  * libSystem_atfork_{prepare,parent,child}() are called by libc during fork(2).
- * They call the corresponding atfork handlers for other libsystem components.
  */
 void
 libSystem_atfork_prepare(void)
 {
+	// first call client prepare handlers registered with pthread_atfork()
+	_pthread_atfork_prepare_handlers();
+
+	// second call hardwired fork prepare handlers for Libsystem components
+	// in the _reverse_ order of library initalization above
 	_libSC_info_fork_prepare();
 	xpc_atfork_prepare();
 	dispatch_atfork_prepare();
-	_pthread_fork_prepare();
 	_malloc_fork_prepare();
+	_pthread_fork_prepare();
 }
 
 void
 libSystem_atfork_parent(void)
 {
-	_malloc_fork_parent();
+	// first call hardwired fork parent handlers for Libsystem components
+	// in the order of library initalization above
 	_pthread_fork_parent();
+	_malloc_fork_parent();
 	dispatch_atfork_parent();
 	xpc_atfork_parent();
 	_libSC_info_fork_parent();
+
+	// second call client parent handlers registered with pthread_atfork()
+	_pthread_atfork_parent_handlers();
 }
 
 void
 libSystem_atfork_child(void)
 {
+	// first call hardwired fork child handlers for Libsystem components
+	// in the order of library initalization above
 	_dyld_fork_child();
 	_pthread_fork_child();
+	_mach_fork_child();
 	_malloc_fork_child();
+	_libc_fork_child(); // _arc4_fork_child calls malloc
 	dispatch_atfork_child();
-	
-	_mach_fork_child();
-	_libc_fork_child();
-
 #if defined(HAVE_SYSTEM_CORESERVICES)
 	_libcoreservices_fork_child();
 #endif
-
 	_asl_fork_child();
 	_notify_fork_child();
 	xpc_atfork_child();
+	_libtrace_fork_child();
 	_libSC_info_fork_child();
 
-	_pthread_fork_child_postinit();
-	_libtrace_fork_child(); // no prep work required for the fork
+	// second call client parent handlers registered with pthread_atfork()
+	_pthread_atfork_child_handlers();
 }
 
 /*  
-- 
2.47.2