mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

windows: Fix process termination code.

Browse source 
The ctrl-c hack used before didn't actually seem to work.

No haskell libraries expose TerminateProcess. I tried just calling it via
FFI, but got segfaults, probably to do with the wacky process handle not
being managed correctly. Moving it all into one C function worked.

This was hell. The EvilLinker hack was just final icing on the cake.
We all know what the cake was made of.
This commit is contained in:
Joey Hess 2014-02-13 14:00:15 -04:00
parent 84083ecdd3
commit f11f7520b5
10 changed files with 58 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/WebApp/Control.hs
View file

@ -24,7 +24,7 @@ import qualified Data.Text as T
#ifndef mingw32_HOST_OS
import System.Posix (signalProcess, sigTERM)
#else
import System.Win32.Console (generateConsoleCtrlEvent, cTRL_C_EVENT)
import Utility.WinProcess
#endif
getShutdownR :: Handler Html
@ -56,7 +56,7 @@ getShutdownConfirmedR = do
#ifndef mingw32_HOST_OS
signalProcess sigTERM =<< getPID
#else
generateConsoleCtrlEvent cTRL_C_EVENT =<< getPID
terminatePID =<< getPID
#endif
redirect NotRunningR