more OsPath conversion

Sponsored-by: Leon Schuermann

Utility/LockFile/PidLock.hs

@@ -50,7 +50,6 @@ import System.Posix.Files.ByteString
 import System.Posix.Process
 import Control.Monad
 import Control.Monad.IO.Class (liftIO, MonadIO)
-import qualified System.FilePath.ByteString as P
 import Data.Maybe
 import Data.List
 import Network.BSD
@@ -151,7 +150,7 @@ tryLock lockfile = do
   where
 	go abslockfile sidelock = do
 		(tmp, h) <- openTmpFileIn 
-			(toOsPath (P.takeDirectory abslockfile)) 
+			(takeDirectory abslockfile)
 			(literalOsPath "locktmp")
 		let tmp' = fromOsPath tmp
 		setFileMode tmp' (combineModes readModes)
@@ -162,7 +161,7 @@ tryLock lockfile = do
 			removeWhenExistsWith removeLink tmp'
 			return Nothing
 		let tooklock st = return $ Just $ LockHandle abslockfile st sidelock
-		linkToLock sidelock tmp' abslockfile >>= \case
+		linkToLock sidelock tmp' (fromOsPath abslockfile) >>= \case
 			Just lckst -> do
 				removeWhenExistsWith removeLink tmp'
 				tooklock lckst
@@ -177,7 +176,7 @@ tryLock lockfile = do
 						-- the pidlock was taken on,
 						-- we know that the pidlock is
 						-- stale, and can take it over.
-						rename tmp' abslockfile
+						rename tmp' (fromOsPath abslockfile)
 						tooklock tmpst
 					_ -> failedlock
 
@@ -201,7 +200,7 @@ linkToLock (Just _) src dest = do
 		Right _ -> do
 			_ <- tryIO $ createLink src dest
 			ifM (catchBoolIO checklinked)
-				( ifM (catchBoolIO $ not <$> checkInsaneLustre dest)
+				( ifM (catchBoolIO $ not <$> checkInsaneLustre (toOsPath dest))
 					( catchMaybeIO $ getFileStatus dest
 					, return Nothing
 					)
@@ -243,16 +242,16 @@ linkToLock (Just _) src dest = do
 -- We can detect this insanity by getting the directory contents after
 -- making the link, and checking to see if 2 copies of the dest file,
 -- with the SAME FILENAME exist.
-checkInsaneLustre :: RawFilePath -> IO Bool
+checkInsaneLustre :: OsPath -> IO Bool
 checkInsaneLustre dest = do
-	fs <- dirContents (P.takeDirectory dest)
+	fs <- dirContents (takeDirectory dest)
 	case length (filter (== dest) fs) of
 		1 -> return False -- whew!
 		0 -> return True -- wtf?
 		_ -> do
 			-- Try to clean up the extra copy we made
 			-- that has the same name. Egads.
-			_ <- tryIO $ removeLink dest
+			_ <- tryIO $ removeLink $ fromOsPath dest
 			return True
 
 -- | Waits as necessary to take a lock.
@@ -268,7 +267,7 @@ waitLock (Seconds timeout) lockfile displaymessage sem = go timeout
 		| n > 0 = liftIO (tryLock lockfile) >>= \case
 			Nothing -> do
 				when (n == pred timeout) $
-					displaymessage $ "waiting for pid lock file " ++ fromRawFilePath lockfile ++ " which is held by another process (or may be stale)"
+					displaymessage $ "waiting for pid lock file " ++ fromOsPath lockfile ++ " which is held by another process (or may be stale)"
 				liftIO $ threadDelaySeconds (Seconds 1)
 				go (pred n)
 			Just lckh -> do
@@ -280,15 +279,15 @@ waitLock (Seconds timeout) lockfile displaymessage sem = go timeout
 
 waitedLock :: MonadIO m => Seconds -> PidLockFile -> (String -> m ()) -> m a
 waitedLock (Seconds timeout) lockfile displaymessage = do
-	displaymessage $ show timeout ++ " second timeout exceeded while waiting for pid lock file " ++ fromRawFilePath lockfile
-	giveup $ "Gave up waiting for pid lock file " ++ fromRawFilePath lockfile
+	displaymessage $ show timeout ++ " second timeout exceeded while waiting for pid lock file " ++ fromOsPath lockfile
+	giveup $ "Gave up waiting for pid lock file " ++ fromOsPath lockfile
 
 -- | Use when the pid lock has already been taken by another thread of the
 -- same process.
 alreadyLocked :: MonadIO m => PidLockFile -> m LockHandle
 alreadyLocked lockfile = liftIO $ do
 	abslockfile <- absPath lockfile
-	st <- getFileStatus abslockfile
+	st <- getFileStatus (fromOsPath abslockfile)
 	return $ LockHandle abslockfile st Nothing
 
 dropLock :: LockHandle -> IO ()
@@ -296,7 +295,7 @@ dropLock (LockHandle lockfile _ sidelock) = do
 	-- Drop side lock first, at which point the pid lock will be
 	-- considered stale.
 	dropSideLock sidelock
-	removeWhenExistsWith removeLink lockfile
+	removeWhenExistsWith removeLink (fromOsPath lockfile)
 dropLock ParentLocked = return ()
 
 getLockStatus :: PidLockFile -> IO LockStatus
@@ -312,7 +311,7 @@ checkLocked lockfile = conv <$> getLockStatus lockfile
 -- locked to get the LockHandle.
 checkSaneLock :: PidLockFile -> LockHandle -> IO Bool
 checkSaneLock lockfile (LockHandle _ st _) = 
-	go =<< catchMaybeIO (getFileStatus lockfile)
+	go =<< catchMaybeIO (getFileStatus (fromOsPath lockfile))
   where
 	go Nothing = return False
 	go (Just st') = return $
@@ -327,9 +326,9 @@ checkSaneLock _ ParentLocked = return True
 -- The parent process should keep running as long as the child
 -- process is running, since the child inherits the environment and will
 -- not see unsetLockEnv.
-pidLockEnv :: RawFilePath -> IO String
+pidLockEnv :: OsPath -> IO String
 pidLockEnv lockfile = do
-	abslockfile <- fromRawFilePath <$> absPath lockfile
+	abslockfile <- fromOsPath <$> absPath lockfile
 	return $ "PIDLOCK_" ++ filter legalInEnvVar abslockfile
 
 pidLockEnvValue :: String

Utility/LockFile/Posix.hs

@@ -25,6 +25,7 @@ import Utility.Applicative
 import Utility.FileMode
 import Utility.LockFile.LockStatus
 import Utility.OpenFd
+import Utility.OsPath
 
 import System.IO
 import System.Posix.Types
@@ -33,7 +34,7 @@ import System.Posix.Files.ByteString
 import System.FilePath.ByteString (RawFilePath)
 import Data.Maybe
 
-type LockFile = RawFilePath
+type LockFile = OsPath
 
 newtype LockHandle = LockHandle Fd
 
@@ -75,11 +76,12 @@ tryLock lockreq mode lockfile = uninterruptibleMask_ $ do
 -- Close on exec flag is set so child processes do not inherit the lock.
 openLockFile :: LockRequest -> Maybe ModeSetter -> LockFile -> IO Fd
 openLockFile lockreq filemode lockfile = do
-	l <- applyModeSetter filemode lockfile $ \filemode' ->
-		openFdWithMode lockfile openfor filemode' defaultFileFlags
+	l <- applyModeSetter filemode lockfile' $ \filemode' ->
+		openFdWithMode lockfile' openfor filemode' defaultFileFlags
 	setFdOption l CloseOnExec True
 	return l
   where
+	lockfile' = fromOsPath lockfile
 	openfor = case lockreq of
 		ReadLock -> ReadOnly
 		_ -> ReadWrite
@@ -120,7 +122,7 @@ dropLock (LockHandle fd) = closeFd fd
 -- else.
 checkSaneLock :: LockFile -> LockHandle -> IO Bool
 checkSaneLock lockfile (LockHandle fd) =
-	go =<< catchMaybeIO (getFileStatus lockfile)
+	go =<< catchMaybeIO (getFileStatus (fromOsPath lockfile))
   where
 	go Nothing = return False
 	go (Just st) = do