Ticket #2458: 2458-unix.dpatch

1 patch for repository darcs.haskell.org:/srv/darcs/packages/unix:

Fri Apr  1 13:19:08 BST 2011  Max Bolingbroke <batterseapower@hotmail.com>
  * Use NSGetEnviron on OS X

New patches:

[Use NSGetEnviron on OS X
Max Bolingbroke <batterseapower@hotmail.com>**20110401121908
 Ignore-this: e8582c3df56bce3aecdcad08592a82f9
] {
hunk ./System/Posix/Env.hsc 58
 
 getEnvironmentPrim :: IO [String]
 getEnvironmentPrim = do
-  c_environ <- peek c_environ_p
+  c_environ <- getCEnviron
   arr <- peekArray0 nullPtr c_environ
   mapM peekCString arr
 
hunk ./System/Posix/Env.hsc 62
+getCEnviron :: IO (Ptr CString)
+#if darwin_HOST_OS
+-- You should not access _environ directly on Darwin in a bundle/shared library.
+-- See #2458 and http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man7/environ.7.html
+getCEnviron = nsGetEnviron >>= peek
+
+foreign import ccall unsafe "_NSGetEnviron"
+   nsGetEnviron :: IO (Ptr (Ptr CString))
+#else
+getCEnviron = peek c_environ_p
+
 foreign import ccall unsafe "&environ"
    c_environ_p :: Ptr (Ptr CString)
hunk ./System/Posix/Env.hsc 75
+#endif
 
 -- |'getEnvironment' retrieves the entire environment as a
 -- list of @(key,value)@ pairs.
}

Context:

[TAG git migration
Ian Lynagh <igloo@earth.li>**20110331135044
 Ignore-this: f484f990e0824737ad31333d2252c29d
] 
Patch bundle hash:
eb19ad610639cddb9ddcbcfdc977d64171f83ffe