From ebd0711e8aa09580bef81590ea277f7bd1f96871 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 9 Nov 2017 15:14:00 -0400
Subject: Revert "use unix-compat 0.5 on windows"

This reverts commit ac57659e61f9743aebd35258e89752ced0040f9f.

Too early for this; needs newer Win32 version. Le sigh.
---
 Utility/DirWatcher/Win32Notify.hs |  2 +-
 Utility/Directory.hs              |  2 +-
 Utility/FileMode.hs               |  2 +-
 Utility/PosixFiles.hs             | 42 +++++++++++++++++++++++++++++++++++++++
 Utility/Tmp.hs                    |  2 +-
 5 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 Utility/PosixFiles.hs

(limited to 'Utility')

diff --git a/Utility/DirWatcher/Win32Notify.hs b/Utility/DirWatcher/Win32Notify.hs
index a2f40128f..3428f3db3 100644
--- a/Utility/DirWatcher/Win32Notify.hs
+++ b/Utility/DirWatcher/Win32Notify.hs
@@ -11,7 +11,7 @@ import Common hiding (isDirectory)
 import Utility.DirWatcher.Types
 
 import System.Win32.Notify
-import qualified System.PosixCompat.Files as Files
+import qualified Utility.PosixFiles as Files
 
 watchDir :: FilePath -> (FilePath -> Bool) -> Bool -> WatchHooks -> IO WatchManager
 watchDir dir ignored scanevents hooks = do
diff --git a/Utility/Directory.hs b/Utility/Directory.hs
index 895581dff..c24f36da5 100644
--- a/Utility/Directory.hs
+++ b/Utility/Directory.hs
@@ -16,7 +16,6 @@ module Utility.Directory (
 import System.IO.Error
 import Control.Monad
 import System.FilePath
-import System.PosixCompat.Files
 import Control.Applicative
 import Control.Concurrent
 import System.IO.Unsafe (unsafeInterleaveIO)
@@ -32,6 +31,7 @@ import Control.Monad.IfElse
 #endif
 
 import Utility.SystemDirectory
+import Utility.PosixFiles
 import Utility.Tmp
 import Utility.Exception
 import Utility.Monad
diff --git a/Utility/FileMode.hs b/Utility/FileMode.hs
index 370bcf62d..d9a269448 100644
--- a/Utility/FileMode.hs
+++ b/Utility/FileMode.hs
@@ -15,7 +15,7 @@ module Utility.FileMode (
 import System.IO
 import Control.Monad
 import System.PosixCompat.Types
-import System.PosixCompat.Files
+import Utility.PosixFiles
 #ifndef mingw32_HOST_OS
 import System.Posix.Files
 import Control.Monad.IO.Class (liftIO)
diff --git a/Utility/PosixFiles.hs b/Utility/PosixFiles.hs
new file mode 100644
index 000000000..37253da29
--- /dev/null
+++ b/Utility/PosixFiles.hs
@@ -0,0 +1,42 @@
+{- POSIX files (and compatablity wrappers).
+ -
+ - This is like System.PosixCompat.Files, but with a few fixes.
+ -
+ - Copyright 2014 Joey Hess <id@joeyh.name>
+ -
+ - License: BSD-2-clause
+ -}
+
+{-# LANGUAGE CPP #-}
+{-# OPTIONS_GHC -fno-warn-tabs #-}
+
+module Utility.PosixFiles (
+	module X,
+	rename
+) where
+
+import System.PosixCompat.Files as X hiding (rename)
+
+#ifndef mingw32_HOST_OS
+import System.Posix.Files (rename)
+#else
+import qualified System.Win32.File as Win32
+import qualified System.Win32.HardLink as Win32
+#endif
+
+{- System.PosixCompat.Files.rename on Windows calls renameFile,
+ - so cannot rename directories. 
+ -
+ - Instead, use Win32 moveFile, which can. It needs to be told to overwrite
+ - any existing file. -}
+#ifdef mingw32_HOST_OS
+rename :: FilePath -> FilePath -> IO ()
+rename src dest = Win32.moveFileEx src dest Win32.mOVEFILE_REPLACE_EXISTING
+#endif
+
+{- System.PosixCompat.Files.createLink throws an error, but windows
+ - does support hard links. -}
+#ifdef mingw32_HOST_OS
+createLink :: FilePath -> FilePath -> IO ()
+createLink = Win32.createHardLink
+#endif
diff --git a/Utility/Tmp.hs b/Utility/Tmp.hs
index 7255c141e..ca611e0b4 100644
--- a/Utility/Tmp.hs
+++ b/Utility/Tmp.hs
@@ -15,13 +15,13 @@ import Control.Monad.IfElse
 import System.FilePath
 import System.Directory
 import Control.Monad.IO.Class
-import System.PosixCompat.Files
 #ifndef mingw32_HOST_OS
 import System.Posix.Temp (mkdtemp)
 #endif
 
 import Utility.Exception
 import Utility.FileSystemEncoding
+import Utility.PosixFiles
 
 type Template = String
 
-- 
cgit v1.2.3