fill in a few windows stubs

2 files changed, 13 insertions, 11 deletions

diff --git a/Git/Construct.hs b/Git/Construct.hs
index b947abd89..54eb84e22 100644..100755
--- a/Git/Construct.hs
+++ b/Git/Construct.hs
@@ -34,6 +34,7 @@ import Network.URI
 import Common
 import Git.Types
 import Git
+import Git.FilePath
 import qualified Git.Url as Url
 import Utility.UserInfo
 
@@ -58,8 +59,7 @@ fromPath dir = fromAbsPath =<< absPath dir
  - specified. -}
 fromAbsPath :: FilePath -> IO Repo
 fromAbsPath dir
-	| isAbsolute dir =
-		ifM (doesDirectoryExist dir') ( ret dir' , hunt )
+	| isAbsolute dir = ifM (doesDirectoryExist dir') ( ret dir' , hunt )
 	| otherwise =
 		error $ "internal error, " ++ dir ++ " is not absolute"
   where
@@ -146,7 +146,7 @@ fromRemoteLocation s repo = gen $ calcloc s
   where
 	gen v	
 #ifdef __WINDOWS__
-		| dosstyle v = fromRemotePath v repo
+		| dosstyle v = fromRemotePath (dospath v) repo
 #endif
 		| scpstyle v = fromUrl $ scptourl v
 		| urlstyle v = fromUrl v
@@ -185,6 +185,7 @@ fromRemoteLocation s repo = gen $ calcloc s
 	-- git on Windows will write a path to .git/config with "drive:",
 	-- which is not to be confused with a "host:"
 	dosstyle = hasDrive
+	dospath = fromInternalGitPath
 #endif
 
 {- Constructs a Repo from the path specified in the git remotes of
diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs
index b23a654cd..e1cd25088 100644..100755
--- a/Utility/Daemon.hs
+++ b/Utility/Daemon.hs
@@ -15,6 +15,7 @@ import Utility.LogFile
 #ifndef __WINDOWS__
 import System.Posix
 #else
+import System.PosixCompat
 import System.Posix.Types
 #endif
 
@@ -48,16 +49,16 @@ daemonize logfd pidfile changedirectory a = do
 		out
 	out = exitImmediately ExitSuccess
 #else
-daemonize = error "daemonize TODO"
+daemonize = error "daemonize is not implemented on Windows" -- TODO
 #endif
 
 {- Locks the pid file, with an exclusive, non-blocking lock.
  - Writes the pid to the file, fully atomically.
  - Fails if the pid file is already locked by another process. -}
 lockPidFile :: FilePath -> IO ()
-#ifndef __WINDOWS__
 lockPidFile file = do
 	createDirectoryIfMissing True (parentDir file)
+#ifndef __WINDOWS__
 	fd <- openFd file ReadWrite (Just stdFileMode) defaultFileFlags
 	locked <- catchMaybeIO $ setLock fd (WriteLock, AbsoluteSeek, 0, 0)
 	fd' <- openFd newfile ReadWrite (Just stdFileMode) defaultFileFlags
@@ -68,13 +69,13 @@ lockPidFile file = do
 		(_, Nothing) -> alreadyRunning
 		_ -> do
 			_ <- fdWrite fd' =<< show <$> getProcessID
-			renameFile newfile file
 			closeFd fd
-  where
-	newfile = file ++ ".new"
 #else
-lockPidFile = error "lockPidFile TODO"
+	writeFile newfile "-1"
 #endif
+	renameFile newfile file
+  where
+	newfile = file ++ ".new"
 
 alreadyRunning :: IO ()
 alreadyRunning = error "Daemon is already running."
@@ -104,7 +105,7 @@ checkDaemon pidfile = do
 			" (got " ++ show pid' ++ 
 			"; expected " ++ show pid ++ " )"
 #else
-checkDaemon = error "checkDaemon TODO"
+checkDaemon pidfile = maybe Nothing readish <$> catchMaybeIO (readFile pidfile)
 #endif
 
 {- Stops the daemon, safely. -}
@@ -115,5 +116,5 @@ stopDaemon pidfile = go =<< checkDaemon pidfile
 	go Nothing = noop
 	go (Just pid) = signalProcess sigTERM pid
 #else
-stopDaemon = error "stopDaemon TODO"
+stopDaemon = error "stopDaemon is not implemented on Windows" -- TODO
 #endif