diff options
author | Joey Hess <joey@kitenet.net> | 2013-12-10 23:19:18 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-12-10 23:19:18 -0400 |
commit | f864a68220a0d77b5b6a5c3f4f25743e8e76aae0 (patch) | |
tree | 3e9006aa151b5c8e2ba8562aeefbd6db23cde69f /GitAnnex.hs | |
parent | 180115645b86580d9077e95504b029152de15fa2 (diff) |
port transferkeys to windows; make stopping in progress transfers work too (probably)
transferkeys had used special FDs for communication, but that would be
quite annoying to do in Windows.
Instead, use stdin and stdout. But, to avoid commands like rsync stomping
on them and messing up the communications channel, they're duplicated to a
different handle; stdin is replaced with a null handle, and stdout is
replaced with a copy of stderr. This should all work in windows too.
Stopping in progress transfers may work on windows.. if the types unify
anyway. ;) May need some more porting.
Diffstat (limited to 'GitAnnex.hs')
-rw-r--r-- | GitAnnex.hs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs index 61d8b918a..5b69a2d9d 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -1,6 +1,6 @@ {- git-annex main program - - - Copyright 2010 Joey Hess <joey@kitenet.net> + - Copyright 2010-2013 Joey Hess <joey@kitenet.net> - - Licensed under the GNU GPL version 3 or higher. -} @@ -23,9 +23,7 @@ import qualified Command.Get import qualified Command.FromKey import qualified Command.DropKey import qualified Command.TransferKey -#ifndef mingw32_HOST_OS import qualified Command.TransferKeys -#endif import qualified Command.ReKey import qualified Command.Reinject import qualified Command.Fix @@ -129,9 +127,7 @@ cmds = concat , Command.FromKey.def , Command.DropKey.def , Command.TransferKey.def -#ifndef mingw32_HOST_OS , Command.TransferKeys.def -#endif , Command.ReKey.def , Command.Fix.def , Command.Fsck.def |