unix 2.8.1.0 → 2.8.1.1

raw patch · 7 files changed

+66/−73 lines, 7 filesdep ~basedep ~bytestringPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, bytestring

API changes (from Hackage documentation)

Files

• System/Posix/Env.hsc +5/−26
• System/Posix/Env/ByteString.hsc +3/−19
• System/Posix/Env/Internal.hsc +29/−0
• System/Posix/Env/PosixString.hsc +3/−19
• changelog.md +3/−0
• tests/Test.hs +21/−8
• unix.cabal +2/−1

@@ -28,16 +28,16 @@  #include "HsUnix.h" +import Foreign hiding (void) import Foreign.C.Error (throwErrnoIfMinus1_) import Foreign.C.Types import Foreign.C.String-import Foreign.Marshal.Array-import Foreign.Ptr-import Foreign.Storable import Control.Monad import Data.Maybe (fromMaybe) import System.Posix.Internals +import qualified System.Posix.Env.Internal as Internal+ -- |'getEnv' looks up a variable in the environment.  getEnv ::@@ -63,28 +63,7 @@    c_getenv :: CString -> IO CString  getEnvironmentPrim :: IO [String]-getEnvironmentPrim = do-  c_environ <- getCEnviron-  -- environ can be NULL-  if c_environ == nullPtr-    then return []-    else do-      arr <- peekArray0 nullPtr c_environ-      mapM peekFilePath arr--getCEnviron :: IO (Ptr CString)-#if HAVE__NSGETENVIRON--- You should not access @char **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)-#endif+getEnvironmentPrim = Internal.getEnvironmentPrim >>= mapM peekFilePath   -- |'getEnvironment' retrieves the entire environment as a -- list of @(key,value)@ pairs.@@ -184,7 +163,7 @@ #else -- Fallback to 'environ[0] = NULL'. clearEnv = do-  c_environ <- getCEnviron+  c_environ <- Internal.getCEnviron   unless (c_environ == nullPtr) $     poke c_environ nullPtr #endif

@@ -44,6 +44,8 @@ import Data.ByteString (ByteString) import Data.ByteString.Internal (ByteString (PS), memcpy) +import qualified System.Posix.Env.Internal as Internal+ -- |'getEnv' looks up a variable in the environment.  getEnv ::@@ -69,25 +71,7 @@    c_getenv :: CString -> IO CString  getEnvironmentPrim :: IO [ByteString]-getEnvironmentPrim = do-  c_environ <- getCEnviron-  arr <- peekArray0 nullPtr c_environ-  mapM B.packCString arr--getCEnviron :: IO (Ptr CString)-#if HAVE__NSGETENVIRON--- You should not access @char **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)-#endif+getEnvironmentPrim = Internal.getEnvironmentPrim >>= mapM B.packCString  -- |'getEnvironment' retrieves the entire environment as a -- list of @(key,value)@ pairs.

@@ -0,0 +1,29 @@+module System.Posix.Env.Internal where++#include "HsUnix.h"++import Foreign+import Foreign.C++getEnvironmentPrim :: IO [Ptr CChar]+getEnvironmentPrim = do+  c_environ <- getCEnviron+  if c_environ == nullPtr+    then return []+    else do+      peekArray0 nullPtr c_environ++getCEnviron :: IO (Ptr CString)+#if HAVE__NSGETENVIRON+-- You should not access @char **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)+#endif

@@ -45,6 +45,8 @@ import qualified System.OsPath.Data.ByteString.Short as B import Data.ByteString.Short.Internal ( copyToPtr ) +import qualified System.Posix.Env.Internal as Internal+ -- |'getEnv' looks up a variable in the environment.  getEnv ::@@ -70,25 +72,7 @@    c_getenv :: CString -> IO CString  getEnvironmentPrim :: IO [PosixString]-getEnvironmentPrim = do-  c_environ <- getCEnviron-  arr <- peekArray0 nullPtr c_environ-  mapM (fmap PS . B.packCString) arr--getCEnviron :: IO (Ptr CString)-#if HAVE__NSGETENVIRON--- You should not access @char **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)-#endif+getEnvironmentPrim = Internal.getEnvironmentPrim >>= mapM (fmap PS . B.packCString)  -- |'getEnvironment' retrieves the entire environment as a -- list of @(key,value)@ pairs.

@@ -1,5 +1,8 @@ # Changelog for [`unix` package](http://hackage.haskell.org/package/unix) +## 2.8.1.1 *Mar 2023*+  * Fix `System.Posix.Env.ByteString.getEnvironment` segfaulting on empty environment+ ## 2.8.1.0 *Feb 2023*   * Fix build if HAVE_ALARM is undefined 

@@ -13,7 +13,7 @@ import System.Exit import System.IO import System.Posix-import qualified System.Posix.Env.ByteString+import qualified System.Posix.Env.ByteString as ByteString import Test.Tasty import Test.Tasty.HUnit @@ -28,7 +28,7 @@   , fileStatus   , fileStatusByteString   , getEnvironment01-  , getEnvironment02+  , testSystemPosixEnvByteString   , getGroupEntry   , getUserEntry   , processGroup001@@ -69,12 +69,25 @@   not (null env)     @? "environment should be non-empty" -getEnvironment02 :: TestTree-getEnvironment02 = testCase "getEnvironment02" $ do-  env <- System.Posix.Env.ByteString.getEnvironment-  not (null env)-    @? "environment should be non-empty"+protectEnvironment :: IO a -> IO a+protectEnvironment action = E.bracket ByteString.getEnvironment ByteString.setEnvironment $ \ _ -> action +testSystemPosixEnvByteString :: TestTree+testSystemPosixEnvByteString =+  testGroup "System.Posix.Env.ByteString" [+    testGroup "getEnvironment" [+      testCase "returns the environment" $ do+        env <- ByteString.getEnvironment+        not (null env)+          @? "environment should be non-empty"+    ]+  , testGroup "clearEnv" [+      testCase "clears the environment" $ protectEnvironment $ do+        ByteString.clearEnv+        ByteString.getEnvironment >>= (@?= [])+    ]+  ]+ getGroupEntry :: TestTree getGroupEntry = testCase "getGroupEntry" $ do   let act = False <$ getGroupEntryForName "thisIsNotMeantToExist"@@ -174,7 +187,7 @@   sort (lines actual) @?= ["ONE=1", "TWO=2"]  posix005 :: TestTree-posix005 = testCase "posix005" $ do+posix005 = testCase "posix005" $ protectEnvironment $ do     hSetBuffering stdout NoBuffering      setEnvironment [("one","1"),("two","2")]

@@ -1,6 +1,6 @@ cabal-version:  1.12 name:           unix-version:        2.8.1.0+version:        2.8.1.1 -- NOTE: Don't forget to update ./changelog.md  license:        BSD3@@ -141,6 +141,7 @@         System.Posix.Process.Common         System.Posix.Terminal.Common         System.Posix.User.Common+        System.Posix.Env.Internal      ghc-options: -Wall