use safewritefile

4 files changed, 7 insertions, 11 deletions

diff --git a/Command/Init.hs b/Command/Init.hs
index e780c8863..2976b988d 100644
--- a/Command/Init.hs
+++ b/Command/Init.hs
@@ -20,6 +20,7 @@ import Version
 import Messages
 import Locations
 import Types
+import Utility
 	
 command :: [Command]
 command = [Command "init" paramDesc seek
@@ -61,7 +62,7 @@ gitAttributesWrite repo = do
 	exists <- doesFileExist attributes
 	if not exists
 		then do
-			writeFile attributes $ attrLine ++ "\n"
+			safeWriteFile attributes $ attrLine ++ "\n"
 			commit
 		else do
 			content <- readFile attributes
@@ -85,7 +86,7 @@ gitPreCommitHookWrite repo = do
 	if exists
 		then warning $ "pre-commit hook (" ++ hook ++ ") already exists, not configuring"
 		else liftIO $ do
-			writeFile hook preCommitScript
+			safeWriteFile hook preCommitScript
 			p <- getPermissions hook
 			setPermissions hook $ p {executable = True}
 	where
diff --git a/Command/Uninit.hs b/Command/Uninit.hs
index 93465df37..e9406ce3a 100644
--- a/Command/Uninit.hs
+++ b/Command/Uninit.hs
@@ -59,5 +59,5 @@ gitAttributesUnWrite repo = do
 	attrexists <- doesFileExist attributes
 	when attrexists $ do
 		c <- readFileStrict attributes
-		writeFile attributes $ unlines $
+		safeWriteFile attributes $ unlines $
 			filter (/= Command.Init.attrLine) $ lines c
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 5e5698e38..b9dc62a32 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -16,6 +16,7 @@ import Types
 import Content
 import Messages
 import Locations
+import Utility
 import qualified Annex
 import qualified GitRepo as Git
 import qualified Backend
@@ -43,7 +44,7 @@ checkUnused = do
 	unused <- unusedKeys
 	let list = number 1 unused
 	g <- Annex.gitRepo
-	liftIO $ writeFile (gitAnnexUnusedLog g) $ unlines $ 
+	liftIO $ safeWriteFile (gitAnnexUnusedLog g) $ unlines $ 
 		map (\(n, k) -> show n ++ " " ++ show k) list
 	if null unused
 		then return True
diff --git a/LocationLog.hs b/LocationLog.hs
index 926939051..56953bc02 100644
--- a/LocationLog.hs
+++ b/LocationLog.hs
@@ -32,7 +32,6 @@ import Data.Time
 import System.Locale
 import qualified Data.Map as Map
 import System.Directory
-import System.Posix.Process
 import Control.Monad (when)
 
 import qualified GitRepo as Git
@@ -112,12 +111,7 @@ readLog file = do
 
 {- Writes a set of lines to a log file -}
 writeLog :: FilePath -> [LogLine] -> IO ()
-writeLog file ls = do
-	pid <- getProcessID
-	let tmpfile = file ++ ".tmp" ++ show pid
-	createDirectoryIfMissing True (parentDir file)
-	writeFile tmpfile $ unlines $ map show ls
-	renameFile tmpfile file
+writeLog file ls = safeWriteFile file (unlines $ map show ls)
 
 {- Generates a new LogLine with the current date. -}
 logNow :: LogStatus -> UUID -> IO LogLine