diff -Nru cabal-install-head-3.1+git20191103.2.129775a/build.sh cabal-install-head-3.1+git20191115.2.eb2f764/build.sh --- cabal-install-head-3.1+git20191103.2.129775a/build.sh 2019-11-06 07:30:19.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/build.sh 2019-11-16 12:22:44.000000000 +0000 @@ -15,6 +15,7 @@ pushd "src/$PKG" rm -rf dist/ ./Setup + if [ ! -f Setup.hs ]; then echo 'import Distribution.Simple; main = defaultMain' > Setup.hs; fi $HC -package-db="$PKGDB" -i --make Setup -o Setup ./Setup configure --package-db="$PKGDB" --prefix="$PREFIX" --disable-library-profiling --disable-shared ./Setup build diff -Nru cabal-install-head-3.1+git20191103.2.129775a/debian/changelog cabal-install-head-3.1+git20191115.2.eb2f764/debian/changelog --- cabal-install-head-3.1+git20191103.2.129775a/debian/changelog 2019-11-06 07:30:57.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/debian/changelog 2019-11-16 12:23:22.000000000 +0000 @@ -1,5 +1,5 @@ -cabal-install-head (3.1+git20191103.2.129775a-6~16.04) xenial; urgency=medium +cabal-install-head (3.1+git20191115.2.eb2f764-6~16.04) xenial; urgency=medium * Initial release - -- Herbert Valerio Riedel Wed, 06 Nov 2019 08:30:57 +0100 + -- Herbert Valerio Riedel Sat, 16 Nov 2019 13:23:22 +0100 diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/buildplan.lst cabal-install-head-3.1+git20191115.2.eb2f764/src/buildplan.lst --- cabal-install-head-3.1+git20191103.2.129775a/src/buildplan.lst 2019-11-06 07:30:05.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/buildplan.lst 2019-11-16 12:22:29.000000000 +0000 @@ -3,6 +3,7 @@ cryptohash-sha256-0.11.101.0 echo-0.1.3 ed25519-0.0.5.0 +lukko-0.1 mtl-2.2.2 network-3.1.1.0 random-1.1 diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Backpack/ComponentsGraph.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Backpack/ComponentsGraph.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Backpack/ComponentsGraph.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Backpack/ComponentsGraph.hs 2019-11-16 12:22:25.000000000 +0000 @@ -8,7 +8,7 @@ componentCycleMsg ) where -import Prelude (head) +import Prelude () import Distribution.Compat.Prelude import Distribution.Package @@ -19,6 +19,7 @@ import Distribution.Types.UnqualComponentName import Distribution.Compat.Graph (Graph, Node(..)) import qualified Distribution.Compat.Graph as Graph +import Distribution.Utils.Generic import Distribution.Pretty (pretty) import Text.PrettyPrint @@ -94,4 +95,4 @@ text $ "Components in the package depend on each other in a cyclic way:\n " ++ intercalate " depends on " [ "'" ++ showComponentName cname ++ "'" - | cname <- cnames ++ [head cnames] ] + | cname <- cnames ++ maybeToList (safeHead cnames) ] diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Compat/Prelude.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Compat/Prelude.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Compat/Prelude.hs 2019-11-06 07:29:56.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Compat/Prelude.hs 2019-11-16 12:22:25.000000000 +0000 @@ -64,6 +64,7 @@ -- * Data.List.NonEmpty NonEmpty((:|)), foldl1, foldr1, + head, tail, last, init, -- * Data.Foldable Foldable, foldMap, foldr, @@ -154,7 +155,7 @@ import Data.List (intercalate, intersperse, isPrefixOf, isSuffixOf, nub, nubBy, sort, sortBy, unfoldr) -import Data.List.NonEmpty (NonEmpty((:|))) +import Data.List.NonEmpty (NonEmpty((:|)), head, tail, init, last) import Data.Maybe import Data.String (IsString (..)) import Data.Int diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Fields/Lexer.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Fields/Lexer.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Fields/Lexer.hs 2019-11-06 07:29:56.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Fields/Lexer.hs 2019-11-16 12:22:25.000000000 +0000 @@ -60,11 +60,11 @@ #endif #if __GLASGOW_HASKELL__ >= 503 import Data.Array -import Data.Array.Base (unsafeAt) #else import Array #endif #if __GLASGOW_HASKELL__ >= 503 +import Data.Array.Base (unsafeAt) import GHC.Exts #else import GlaExts diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/PackageDescription/Check.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/PackageDescription/Check.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/PackageDescription/Check.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/PackageDescription/Check.hs 2019-11-16 12:22:25.000000000 +0000 @@ -34,7 +34,7 @@ ) where import Distribution.Compat.Prelude -import Prelude (last, init) +import Prelude () import Control.Monad (mapM) import Data.List (group) @@ -56,7 +56,7 @@ import Distribution.Types.ExeDependency import Distribution.Types.LibraryName import Distribution.Types.UnqualComponentName -import Distribution.Utils.Generic (isAscii) +import Distribution.Utils.Generic (isAscii, safeInit) import Distribution.Verbosity import Distribution.Version import Language.Haskell.Extension @@ -1591,8 +1591,8 @@ boundedAbove :: VersionRange -> Bool boundedAbove vr = case asVersionIntervals vr of - [] -> True -- this is the inconsistent version range. - intervals -> case last intervals of + [] -> True -- this is the inconsistent version range. + (x:xs) -> case last (x:|xs) of (_, UpperBound _ _) -> True (_, NoUpperBound ) -> False @@ -2145,7 +2145,7 @@ Right (_:_) -> Just noSplit where -- drop the '/' between the name and prefix: - remainder = init h : rest + remainder = safeInit h : rest where nameMax, prefixMax :: Int diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Build.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Build.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Build.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Build.hs 2019-11-16 12:22:25.000000000 +0000 @@ -28,8 +28,9 @@ writeAutogenFiles, ) where -import Prelude (head, init) +import Prelude () import Distribution.Compat.Prelude +import Distribution.Utils.Generic import Distribution.Types.ComponentLocalBuildInfo import Distribution.Types.ComponentRequestedSpec @@ -154,7 +155,9 @@ target <- readTargetInfos verbosity pkg_descr lbi args >>= \r -> case r of -- This seems DEEPLY questionable. - [] -> return (head (allTargetsInBuildOrder' pkg_descr lbi)) + [] -> case allTargetsInBuildOrder' pkg_descr lbi of + (target:_) -> return target + [] -> die' verbosity $ "Failed to determine target." [target] -> return target _ -> die' verbosity $ "The 'repl' command does not support multiple targets at once." let componentsToBuild = neededTargetsInBuildOrder' pkg_descr lbi [nodeKey target] @@ -180,7 +183,7 @@ componentInitialBuildSteps distPref pkg_descr lbi clbi verbosity buildComponent verbosity NoFlag pkg_descr lbi' suffixes comp clbi distPref - | subtarget <- init componentsToBuild ] + | subtarget <- safeInit componentsToBuild ] -- REPL for target components let clbi = targetCLBI target diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Configure.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Configure.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Configure.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Configure.hs 2019-11-16 12:22:25.000000000 +0000 @@ -54,7 +54,7 @@ , platformDefines, ) where -import Prelude (head, tail, last) +import qualified Prelude (tail) import Distribution.Compat.Prelude import Distribution.Compiler @@ -102,6 +102,7 @@ import Distribution.Backpack.PreExistingComponent import Distribution.Backpack.ConfiguredComponent (newPackageDepsBehaviour) import Distribution.Backpack.Id +import Distribution.Utils.Generic import Distribution.Utils.LogProgress import qualified Distribution.Simple.GHC as GHC @@ -112,6 +113,7 @@ import Control.Exception ( ErrorCall, Exception, evaluate, throw, throwIO, try ) import Control.Monad ( forM, forM_ ) +import Data.List.NonEmpty ( nonEmpty ) import Distribution.Compat.Binary ( decodeOrFailIO, encode ) import Distribution.Compat.Directory ( listDirectory ) import Data.ByteString.Lazy ( ByteString ) @@ -1313,18 +1315,21 @@ -- It's an external package, normal situation do_external_external = - case PackageIndex.lookupDependency installedIndex dep_pkgname vr of - [] -> Left (DependencyNotExists dep_pkgname) - pkgs -> Right $ head $ snd $ last pkgs + case pickLastIPI $ PackageIndex.lookupDependency installedIndex dep_pkgname vr of + Nothing -> Left (DependencyNotExists dep_pkgname) + Just pkg -> Right pkg -- It's an internal library, being looked up externally do_external_internal :: LibraryName -> Either FailedDependency InstalledPackageInfo do_external_internal ln = - case PackageIndex.lookupInternalDependency installedIndex + case pickLastIPI $ PackageIndex.lookupInternalDependency installedIndex (packageName pkgid) vr ln of - [] -> Left (DependencyMissingInternal dep_pkgname (packageName pkgid)) - pkgs -> Right $ head $ snd $ last pkgs + Nothing -> Left (DependencyMissingInternal dep_pkgname (packageName pkgid)) + Just pkg -> Right pkg + + pickLastIPI :: [(Version, [InstalledPackageInfo])] -> Maybe InstalledPackageInfo + pickLastIPI pkgs = safeHead . snd . last =<< nonEmpty pkgs reportSelectedDependencies :: Verbosity -> [ResolvedDependency] -> IO () @@ -1773,7 +1778,7 @@ findOffendingHdr = ifBuildsWith allHeaders ccArgs (return Nothing) - (go . tail . inits $ allHeaders) + (go . Prelude.tail . inits $ allHeaders) -- inits always contains at least [] where go [] = return Nothing -- cannot happen go (hdrs:hdrsInits) = @@ -1782,8 +1787,9 @@ -- If that works, try compiling too (ifBuildsWith hdrs ccArgs (go hdrsInits) - (return . Just . Right . last $ hdrs)) - (return . Just . Left . last $ hdrs) + (return . fmap Right . safeLast $ hdrs)) + (return . fmap Left . safeLast $ hdrs) + cppArgs = "-E":commonCppArgs -- preprocess only ccArgs = "-c":commonCcArgs -- don't try to link @@ -2004,7 +2010,7 @@ -- database to which the package is installed are relative to the -- prefix of the package depsPrefixRelative = do - pkgr <- GHC.pkgRoot verbosity lbi (last (withPackageDB lbi)) + pkgr <- GHC.pkgRoot verbosity lbi (registrationPackageDB (withPackageDB lbi)) traverse_ (doCheck pkgr) ipkgs where doCheck pkgr ipkg diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/GHC.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/GHC.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/GHC.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/GHC.hs 2019-11-16 12:22:25.000000000 +0000 @@ -69,7 +69,7 @@ GhcImplInfo(..) ) where -import Prelude (head, tail) +import Prelude () import Distribution.Compat.Prelude import qualified Distribution.Simple.GHC.Internal as Internal @@ -1074,24 +1074,26 @@ -- https://github.com/haskell/cabal/pull/4539#discussion_r118981753. decodeMainIsArg :: String -> Maybe ModuleName decodeMainIsArg arg - | not (null main_fn) && isLower (head main_fn) + | headOf main_fn isLower -- The arg looked like "Foo.Bar.baz" = Just (ModuleName.fromString main_mod) - | isUpper (head arg) -- The arg looked like "Foo" or "Foo.Bar" + | headOf arg isUpper -- The arg looked like "Foo" or "Foo.Bar" = Just (ModuleName.fromString arg) | otherwise -- The arg looked like "baz" = Nothing where + headOf :: String -> (Char -> Bool) -> Bool + headOf str pred' = any pred' (safeHead str) + (main_mod, main_fn) = splitLongestPrefix arg (== '.') splitLongestPrefix :: String -> (Char -> Bool) -> (String,String) splitLongestPrefix str pred' | null r_pre = (str, []) - | otherwise = (reverse (tail r_pre), reverse r_suf) - -- 'tail' drops the char satisfying 'pred' + | otherwise = (reverse (safeTail r_pre), reverse r_suf) + -- 'safeTail' drops the char satisfying 'pred' where (r_suf, r_pre) = break pred' (reverse str) - -- | A collection of: -- * C input files -- * C++ input files diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/GHCJS.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/GHCJS.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/GHCJS.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/GHCJS.hs 2019-11-16 12:22:25.000000000 +0000 @@ -37,7 +37,7 @@ GhcImplInfo(..) ) where -import Prelude (head) +import Prelude () import Distribution.Compat.Prelude import qualified Distribution.Simple.GHC.Internal as Internal @@ -926,21 +926,24 @@ -- https://github.com/haskell/cabal/pull/4539#discussion_r118981753. decodeMainIsArg :: String -> Maybe ModuleName decodeMainIsArg arg - | not (null main_fn) && isLower (head main_fn) + | headOf main_fn isLower -- The arg looked like "Foo.Bar.baz" = Just (ModuleName.fromString main_mod) - | isUpper (head arg) -- The arg looked like "Foo" or "Foo.Bar" + | headOf arg isUpper -- The arg looked like "Foo" or "Foo.Bar" = Just (ModuleName.fromString arg) | otherwise -- The arg looked like "baz" = Nothing where + headOf :: String -> (Char -> Bool) -> Bool + headOf str pred' = any pred' (safeHead str) + (main_mod, main_fn) = splitLongestPrefix arg (== '.') splitLongestPrefix :: String -> (Char -> Bool) -> (String,String) splitLongestPrefix str pred' | null r_pre = (str, []) | otherwise = (reverse (safeTail r_pre), reverse r_suf) - -- 'tail' drops the char satisfying 'pred' + -- 'safeTail' drops the char satisfying 'pred' where (r_suf, r_pre) = break pred' (reverse str) diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/HaskellSuite.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/HaskellSuite.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/HaskellSuite.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/HaskellSuite.hs 2019-11-16 12:22:25.000000000 +0000 @@ -3,7 +3,7 @@ module Distribution.Simple.HaskellSuite where -import Prelude (last, init) +import Prelude () import Distribution.Compat.Prelude import Data.Either (partitionEithers) @@ -26,6 +26,7 @@ import Distribution.Simple.LocalBuildInfo import Distribution.System (Platform) import Distribution.Compat.Exception +import Distribution.Utils.Generic import Language.Haskell.Extension import Distribution.Simple.Program.Builtin @@ -92,15 +93,15 @@ hstoolVersion = findProgramVersion "--hspkg-version" id numericVersion :: Verbosity -> FilePath -> IO (Maybe Version) -numericVersion = findProgramVersion "--compiler-version" (last . words) +numericVersion = findProgramVersion "--compiler-version" (fromMaybe "" . safeLast . words) getCompilerVersion :: Verbosity -> ConfiguredProgram -> IO (String, Version) getCompilerVersion verbosity prog = do output <- rawSystemStdout verbosity (programPath prog) ["--compiler-version"] let parts = words output - name = concat $ init parts -- there shouldn't be any spaces in the name anyway - versionStr = last parts + name = concat $ safeInit parts -- there shouldn't be any spaces in the name anyway + versionStr = fromMaybe "" $ safeLast parts version <- maybe (die' verbosity "haskell-suite: couldn't determine compiler version") return $ simpleParsec versionStr @@ -217,7 +218,7 @@ runProgramInvocation verbosity $ (programInvocation hspkg - ["update", packageDbOpt $ last packageDbs]) + ["update", packageDbOpt $ registrationPackageDB packageDbs]) { progInvokeInput = Just $ showInstalledPackageInfo installedPkgInfo } initPackageDB :: Verbosity -> ProgramDb -> FilePath -> IO () diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Program/HcPkg.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Program/HcPkg.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Program/HcPkg.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Program/HcPkg.hs 2019-11-16 12:22:25.000000000 +0000 @@ -42,8 +42,8 @@ listInvocation, ) where -import Prelude (last) -import Distribution.Compat.Prelude +import Prelude () +import Distribution.Compat.Prelude hiding (init) import Data.Either (partitionEithers) import qualified Data.List.NonEmpty as NE @@ -162,7 +162,7 @@ -- | registerMultiInstance registerOptions , recacheMultiInstance hpi - = do let pkgdb = last packagedbs + = do let pkgdb = registrationPackageDB packagedbs writeRegistrationFileDirectly verbosity hpi pkgdb pkgInfo recache hpi verbosity pkgdb @@ -386,9 +386,7 @@ | otherwise = "register" args file = [cmdname, file] - ++ (if noPkgDbStack hpi - then [packageDbOpts hpi (last packagedbs)] - else packageDbStackOpts hpi packagedbs) + ++ packageDbStackOpts hpi packagedbs ++ [ "--enable-multi-instance" | registerMultiInstance registerOptions ] ++ [ "--force-files" @@ -423,9 +421,7 @@ describeInvocation hpi verbosity packagedbs pkgid = programInvocation (hcPkgProgram hpi) $ ["describe", prettyShow pkgid] - ++ (if noPkgDbStack hpi - then [packageDbOpts hpi (last packagedbs)] - else packageDbStackOpts hpi packagedbs) + ++ packageDbStackOpts hpi packagedbs ++ verbosityOpts hpi verbosity hideInvocation :: HcPkgInfo -> Verbosity -> PackageDB -> PackageId @@ -460,19 +456,21 @@ packageDbStackOpts :: HcPkgInfo -> PackageDBStack -> [String] -packageDbStackOpts hpi dbstack = case dbstack of - (GlobalPackageDB:UserPackageDB:dbs) -> "--global" - : "--user" - : map specific dbs - (GlobalPackageDB:dbs) -> "--global" - : ("--no-user-" ++ packageDbFlag hpi) - : map specific dbs - _ -> ierror - where - specific (SpecificPackageDB db) = "--" ++ packageDbFlag hpi ++ "=" ++ db - specific _ = ierror - ierror :: a - ierror = error ("internal error: unexpected package db stack: " ++ show dbstack) +packageDbStackOpts hpi dbstack + | noPkgDbStack hpi = [packageDbOpts hpi (registrationPackageDB dbstack)] + | otherwise = case dbstack of + (GlobalPackageDB:UserPackageDB:dbs) -> "--global" + : "--user" + : map specific dbs + (GlobalPackageDB:dbs) -> "--global" + : ("--no-user-" ++ packageDbFlag hpi) + : map specific dbs + _ -> ierror + where + specific (SpecificPackageDB db) = "--" ++ packageDbFlag hpi ++ "=" ++ db + specific _ = ierror + ierror :: a + ierror = error ("internal error: unexpected package db stack: " ++ show dbstack) packageDbFlag :: HcPkgInfo -> String packageDbFlag hpi diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Program/Run.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Program/Run.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/Program/Run.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/Program/Run.hs 2019-11-16 12:22:25.000000000 +0000 @@ -27,13 +27,14 @@ getEffectiveEnvironment, ) where -import Prelude (last, init) +import Prelude () import Distribution.Compat.Prelude import Distribution.Simple.Program.Types import Distribution.Simple.Utils import Distribution.Verbosity import Distribution.Compat.Environment +import Distribution.Utils.Generic import qualified Data.Map as Map import System.FilePath @@ -243,13 +244,14 @@ chunkSize = maxCommandLineSize - fixedArgSize in case splitChunks chunkSize args of - [] -> [ simple ] + [] -> [ simple ] - [c] -> [ simple `appendArgs` c ] + [c] -> [ simple `appendArgs` c ] - (c:cs) -> [ initial `appendArgs` c ] - ++ [ middle `appendArgs` c'| c' <- init cs ] - ++ [ final `appendArgs` c'| let c' = last cs ] + (c:c2:cs) | (xs, x) <- unsnocNE (c2:|cs) -> + [ initial `appendArgs` c ] + ++ [ middle `appendArgs` c'| c' <- xs ] + ++ [ final `appendArgs` x ] where appendArgs :: ProgramInvocation -> [String] -> ProgramInvocation diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/UHC.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/UHC.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple/UHC.hs 2019-11-06 07:29:56.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple/UHC.hs 2019-11-16 12:22:25.000000000 +0000 @@ -22,7 +22,7 @@ buildLib, buildExe, installLib, registerPackage, inplacePackageDbPath ) where -import Prelude (last) +import Prelude () import Distribution.Compat.Prelude import Distribution.InstalledPackageInfo @@ -277,7 +277,7 @@ -> InstalledPackageInfo -> IO () registerPackage verbosity comp progdb packageDbs installedPkgInfo = do - dbdir <- case last packageDbs of + dbdir <- case registrationPackageDB packageDbs of GlobalPackageDB -> getGlobalPackageDir verbosity progdb UserPackageDB -> getUserPackageDir SpecificPackageDB dir -> return dir diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Simple.hs 2019-11-06 07:29:55.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Simple.hs 2019-11-16 12:22:25.000000000 +0000 @@ -57,7 +57,7 @@ import Control.Exception (try) -import Prelude (head) +import Prelude () import Distribution.Compat.Prelude -- local @@ -524,9 +524,9 @@ ++ "but the package does not have a library." sanityCheckHookedBuildInfo verbosity pkg_descr (_, hookExes) - | not (null nonExistant) + | exe1 : _ <- nonExistant = die' verbosity $ "The buildinfo contains info for an executable called '" - ++ prettyShow (head nonExistant) ++ "' but the package does not have a " + ++ prettyShow exe1 ++ "' but the package does not have a " ++ "executable with that name." where pkgExeNames = nub (map exeName (executables pkg_descr)) diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Types/VersionInterval.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Types/VersionInterval.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Types/VersionInterval.hs 2019-11-06 07:29:56.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Types/VersionInterval.hs 2019-11-16 12:22:25.000000000 +0000 @@ -21,7 +21,7 @@ Bound(..), ) where -import Prelude (tail) +import Prelude () import Distribution.Compat.Prelude import Control.Exception (assert) @@ -118,9 +118,9 @@ doesNotTouch' ((_,u), (l',_)) = doesNotTouch u l' adjacentIntervals :: [(VersionInterval, VersionInterval)] - adjacentIntervals - | null intervals = [] - | otherwise = zip intervals (tail intervals) + adjacentIntervals = case intervals of + [] -> [] + (_:tl) -> zip intervals tl checkInvariant :: VersionIntervals -> VersionIntervals checkInvariant is = assert (invariant is) is diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Types/VersionRange.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Types/VersionRange.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Types/VersionRange.hs 2019-11-06 07:29:56.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Types/VersionRange.hs 2019-11-16 12:22:25.000000000 +0000 @@ -39,7 +39,8 @@ import Distribution.Compat.Prelude import Distribution.Types.Version import Distribution.Types.VersionRange.Internal -import Prelude (last, init) +import Distribution.Utils.Generic +import Prelude () -- | Fold over the basic syntactic structure of a 'VersionRange'. -- @@ -130,7 +131,9 @@ -- | @since 2.2 wildcardUpperBound :: Version -> Version wildcardUpperBound = alterVersion $ - \lowerBound -> init lowerBound ++ [last lowerBound + 1] + \lowerBound -> case unsnoc lowerBound of + Nothing -> [] + Just (xs, x) -> xs ++ [x + 1] isWildcardRange :: Version -> Version -> Bool isWildcardRange ver1 ver2 = check (versionNumbers ver1) (versionNumbers ver2) diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Utils/Generic.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Utils/Generic.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Distribution/Utils/Generic.hs 2019-11-06 07:29:56.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Distribution/Utils/Generic.hs 2019-11-16 12:22:25.000000000 +0000 @@ -74,13 +74,15 @@ unfoldrM, spanMaybe, breakMaybe, + unsnoc, + unsnocNE, -- * FilePath stuff isAbsoluteOnAnyPlatform, isRelativeOnAnyPlatform, ) where -import Prelude (head, tail, last, init) +import Prelude () import Distribution.Compat.Prelude import Distribution.Utils.String @@ -283,11 +285,11 @@ -- -- Example: -- --- >>> tail $ Data.List.dropWhileEnd (<3) [undefined, 5, 4, 3, 2, 1] +-- >>> safeTail $ Data.List.dropWhileEnd (<3) [undefined, 5, 4, 3, 2, 1] -- *** Exception: Prelude.undefined -- ... -- --- >>> tail $ dropWhileEndLE (<3) [undefined, 5, 4, 3, 2, 1] +-- >>> safeTail $ dropWhileEndLE (<3) [undefined, 5, 4, 3, 2, 1] -- [5,4,3] -- -- >>> take 3 $ Data.List.dropWhileEnd (<3) [5, 4, 3, 2, 1, undefined] @@ -368,23 +370,24 @@ -- | A total variant of 'head'. safeHead :: [a] -> Maybe a -safeHead [] = Nothing -safeHead xs = Just (head xs) +safeHead [] = Nothing +safeHead (x:_) = Just x -- | A total variant of 'tail'. safeTail :: [a] -> [a] -safeTail [] = [] -safeTail xs = tail xs +safeTail [] = [] +safeTail (_:xs) = xs -- | A total variant of 'last'. safeLast :: [a] -> Maybe a -safeLast [] = Nothing -safeLast xs = Just (last xs) +safeLast [] = Nothing +safeLast (x:xs) = Just (foldl (\_ a -> a) x xs) -- | A total variant of 'init'. safeInit :: [a] -> [a] -safeInit [] = [] -safeInit xs = init xs +safeInit [] = [] +safeInit [_] = [] +safeInit (x:xs) = x : safeInit xs equating :: Eq a => (b -> a) -> b -> b -> Bool equating p x y = p x == p y @@ -472,6 +475,35 @@ Nothing -> return [] Just (a, b') -> liftM (a :) (go b') +-- | The opposite of 'snoc', which is the reverse of 'cons' +-- +-- Example: +-- +-- >>> unsnoc [1, 2, 3] +-- Just ([1,2],3) +-- +-- >>> unsnoc [] +-- Nothing +-- +unsnoc :: [a] -> Maybe ([a], a) +unsnoc [] = Nothing +unsnoc (x:xs) = Just (unsnocNE (x :| xs)) + +-- | Like 'unsnoc', but for 'NonEmpty' so without the 'Maybe' +-- +-- Example: +-- +-- >>> unsnocNE (1 :| [2, 3]) +-- ([1,2],3) +-- +-- >>> unsnocNE (1 :| []) +-- ([],1) +-- +unsnocNE :: NonEmpty a -> ([a], a) +unsnocNE (x:|xs) = go x xs where + go y [] = ([], y) + go y (z:zs) = let ~(ws, w) = go z zs in (y : ws, w) + -- ------------------------------------------------------------ -- * FilePath stuff -- ------------------------------------------------------------ diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Language/Haskell/Extension.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Language/Haskell/Extension.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/Language/Haskell/Extension.hs 2019-11-06 07:29:56.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/Language/Haskell/Extension.hs 2019-11-16 12:22:25.000000000 +0000 @@ -23,7 +23,7 @@ classifyExtension, ) where -import Prelude (head) +import qualified Prelude (head) import Distribution.Compat.Prelude import Data.Array (Array, accumArray, bounds, Ix(inRange), (!)) @@ -889,6 +889,6 @@ knownExtensionTable :: Array Char [(String, KnownExtension)] knownExtensionTable = accumArray (flip (:)) [] ('A', 'Z') - [ (head str, (str, extension)) + [ (Prelude.head str, (str, extension)) -- assume KnownExtension's Show returns a non-empty string | extension <- [toEnum 0 ..] , let str = show extension ] diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/tests/UnitTests/Distribution/Version.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/tests/UnitTests/Distribution/Version.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/Cabal-3.1.0.0/tests/UnitTests/Distribution/Version.hs 2019-11-06 07:29:57.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/Cabal-3.1.0.0/tests/UnitTests/Distribution/Version.hs 2019-11-16 12:22:25.000000000 +0000 @@ -6,12 +6,13 @@ module UnitTests.Distribution.Version (versionTests) where import Distribution.Compat.Prelude.Internal -import Prelude (tail, last, init) +import Prelude () import Distribution.Version import Distribution.Types.VersionRange.Internal import Distribution.Parsec (simpleParsec) import Distribution.Pretty +import Distribution.Utils.Generic import Data.Typeable (typeOf) import Math.NumberTheory.Logarithms (intLog2) @@ -317,7 +318,9 @@ withinRange v' (withinVersion v) == (v' >= v && v' < upper v) where - upper = alterVersion $ \numbers -> init numbers ++ [last numbers + 1] + upper = alterVersion $ \numbers -> case unsnoc numbers of + Nothing -> [] + Just (xs, x) -> xs ++ [x + 1] prop_foldVersionRange :: VersionRange -> Property prop_foldVersionRange range = @@ -342,7 +345,9 @@ expandVR (VersionRangeParens v) = expandVR v expandVR v = v - upper = alterVersion $ \numbers -> init numbers ++ [last numbers + 1] + upper = alterVersion $ \numbers -> case unsnoc numbers of + Nothing -> [] + Just (xs, x) -> xs ++ [x + 1] prop_isAnyVersion1 :: VersionRange -> Version -> Property prop_isAnyVersion1 range version = @@ -362,11 +367,11 @@ prop_isSpecificVersion1 :: VersionRange -> NonEmptyList Version -> Property prop_isSpecificVersion1 range (NonEmpty versions) = isJust version && not (null versions') ==> - allEqual (fromJust version : versions') + allEqual (fromJust version) versions' where - version = isSpecificVersion range - versions' = filter (`withinRange` range) versions - allEqual xs = and (zipWith (==) xs (tail xs)) + version = isSpecificVersion range + versions' = filter (`withinRange` range) versions + allEqual x xs = and (zipWith (==) (x:xs) xs) prop_isSpecificVersion2 :: VersionRange -> Property prop_isSpecificVersion2 range = diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/bootstrap.sh cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/bootstrap.sh --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/bootstrap.sh 2019-11-06 07:30:03.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/bootstrap.sh 2019-11-16 12:22:27.000000000 +0000 @@ -266,8 +266,8 @@ # >= 0.5.0.3 && < 0.6 DIGEST_VER="0.0.1.2"; DIGEST_REGEXP="0\.0\.(1\.[2-9]|[2-9]\.?)" # >= 0.0.1.2 && < 0.1 -ZIP_ARCHIVE_VER="0.3.3"; ZIP_ARCHIVE_REGEXP="0\.3\.[3-9]" - # >= 0.3.3 && < 0.4 +LUKKO_VER="0.1.1"; LUKKO_VER_REGEXP="0\.1\.[1-9]" + # >= 0.1.1 && <0.2 HACKAGE_URL="https://hackage.haskell.org/package" @@ -471,7 +471,7 @@ info_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP} info_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP} info_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP} -info_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP} +info_pkg "lukko" ${LUKKO_VER} ${LUKKO_REGEXP} info_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \ ${HACKAGE_SECURITY_VER_REGEXP} @@ -509,7 +509,7 @@ do_pkg "ed25519" ${ED25519_VER} ${ED25519_VER_REGEXP} do_pkg "tar" ${TAR_VER} ${TAR_VER_REGEXP} do_pkg "digest" ${DIGEST_VER} ${DIGEST_REGEXP} -do_pkg "zip-archive" ${ZIP_ARCHIVE_VER} ${ZIP_ARCHIVE_REGEXP} +do_pkg "lukko" ${LUKKO_VER} ${LUKKO_REGEXP} do_pkg "hackage-security" ${HACKAGE_SECURITY_VER} \ ${HACKAGE_SECURITY_VER_REGEXP} diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/cabal-install.cabal cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/cabal-install.cabal --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/cabal-install.cabal 2019-11-06 07:30:03.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/cabal-install.cabal 2019-11-16 12:22:27.000000000 +0000 @@ -21,7 +21,6 @@ Build-type: Custom Extra-Source-Files: README.md bash-completion/cabal bootstrap.sh changelog - tests/README.md -- Generated with 'make gen-extra-source-files' -- Do NOT edit this section manually; instead, run the script. @@ -122,6 +121,11 @@ default: False manual: True +Flag lukko + description: Use @lukko@ for file-locking + default: True + manual: True + custom-setup setup-depends: Cabal >= 2.2, @@ -176,7 +180,6 @@ Distribution.Client.CmdSdist Distribution.Client.Compat.Directory Distribution.Client.Compat.ExecutablePath - Distribution.Client.Compat.FileLock Distribution.Client.Compat.FilePerms Distribution.Client.Compat.Prelude Distribution.Client.Compat.Process @@ -352,6 +355,11 @@ else build-depends: unix >= 2.5 && < 2.9 + if flag(lukko) + build-depends: lukko >= 0.1 && <0.2 + else + build-depends: base >= 4.10 + if flag(debug-expensive-assertions) cpp-options: -DDEBUG_EXPENSIVE_ASSERTIONS diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/CmdInstall.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/CmdInstall.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/CmdInstall.hs 2019-11-06 07:30:01.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/CmdInstall.hs 2019-11-16 12:22:27.000000000 +0000 @@ -18,7 +18,7 @@ establishDummyProjectBaseContext ) where -import Prelude (head) +import Prelude () import Distribution.Client.Compat.Prelude import Distribution.Compat.Directory ( doesPathExist ) @@ -116,7 +116,7 @@ , withTempDirectory, createDirectoryIfMissingVerbose , ordNub ) import Distribution.Utils.Generic - ( writeFileAtomic ) + ( safeHead, writeFileAtomic ) import Distribution.Deprecated.Text ( simpleParse ) import Distribution.Pretty @@ -679,7 +679,8 @@ if supportsPkgEnvFiles $ getImplInfo compiler then do let - getLatest = fmap (head . snd) . take 1 . sortBy (comparing (Down . fst)) + getLatest :: PackageName -> [InstalledPackageInfo] + getLatest = (=<<) (maybeToList . safeHead . snd) . take 1 . sortBy (comparing (Down . fst)) . PI.lookupPackageName installedIndex globalLatest = concat (getLatest <$> globalPackages) diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/CmdRepl.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/CmdRepl.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/CmdRepl.hs 2019-11-06 07:30:01.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/CmdRepl.hs 2019-11-16 12:22:27.000000000 +0000 @@ -17,7 +17,7 @@ selectComponentTarget ) where -import Prelude (head) +import Prelude () import Distribution.Client.Compat.Prelude import Distribution.Compat.Lens @@ -91,6 +91,8 @@ ( anyVersion ) import Distribution.Deprecated.Text ( display ) +import Distribution.Utils.Generic + ( safeHead ) import Distribution.Verbosity ( Verbosity, normal, lessVerbose ) import Distribution.Simple.Utils @@ -256,7 +258,7 @@ targets <- validatedTargets elaboratedPlan targetSelectors let - (unitId, _) = head $ Map.toList targets + Just (unitId, _) = safeHead $ Map.toList targets originalDeps = installedUnitId <$> InstallPlan.directDeps elaboratedPlan unitId oci = OriginalComponentInfo unitId originalDeps Just pkgId = packageId <$> InstallPlan.lookup elaboratedPlan unitId diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Compat/FileLock.hsc cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Compat/FileLock.hsc --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Compat/FileLock.hsc 2019-11-06 07:30:01.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Compat/FileLock.hsc 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE InterruptibleFFI #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE MultiWayIf #-} -{-# LANGUAGE DeriveDataTypeable #-} - --- | This compat module can be removed once base-4.10 (ghc-8.2) is the minimum --- required version. Though note that the locking functionality is not in --- public modules in base-4.10, just in the "GHC.IO.Handle.Lock" module. -module Distribution.Client.Compat.FileLock ( - FileLockingNotSupported(..) - , LockMode(..) - , hLock - , hTryLock - ) where - -#if MIN_VERSION_base(4,10,0) - -import GHC.IO.Handle.Lock - -#else - --- The remainder of this file is a modified copy --- of GHC.IO.Handle.Lock from ghc-8.2.x --- --- The modifications were just to the imports and the CPP, since we do not have --- access to the HAVE_FLOCK from the ./configure script. We approximate the --- lack of HAVE_FLOCK with defined(solaris2_HOST_OS) instead since that is the --- only known major Unix platform lacking flock(). - -import Control.Exception (Exception) -import Data.Typeable - -#if defined(solaris2_HOST_OS) - -import Control.Exception (throwIO) -import System.IO (Handle) - -#else - -import Data.Bits -import Data.Function -import Control.Concurrent.MVar - -import Foreign.C.Error -import Foreign.C.Types - -import GHC.IO.Handle.Types -import GHC.IO.FD -import GHC.IO.Exception - -#if defined(mingw32_HOST_OS) - -#if defined(i386_HOST_ARCH) -## define WINDOWS_CCONV stdcall -#elif defined(x86_64_HOST_ARCH) -## define WINDOWS_CCONV ccall -#else -# error Unknown mingw32 arch -#endif - -#include - -import Foreign.Marshal.Alloc -import Foreign.Marshal.Utils -import Foreign.Ptr -import GHC.Windows - -#else /* !defined(mingw32_HOST_OS), so assume unix with flock() */ - -#include - -#endif /* !defined(mingw32_HOST_OS) */ - -#endif /* !defined(solaris2_HOST_OS) */ - - --- | Exception thrown by 'hLock' on non-Windows platforms that don't support --- 'flock'. -data FileLockingNotSupported = FileLockingNotSupported - deriving (Typeable, Show) - -instance Exception FileLockingNotSupported - - --- | Indicates a mode in which a file should be locked. -data LockMode = SharedLock | ExclusiveLock - --- | If a 'Handle' references a file descriptor, attempt to lock contents of the --- underlying file in appropriate mode. If the file is already locked in --- incompatible mode, this function blocks until the lock is established. The --- lock is automatically released upon closing a 'Handle'. --- --- Things to be aware of: --- --- 1) This function may block inside a C call. If it does, in order to be able --- to interrupt it with asynchronous exceptions and/or for other threads to --- continue working, you MUST use threaded version of the runtime system. --- --- 2) The implementation uses 'LockFileEx' on Windows and 'flock' otherwise, --- hence all of their caveats also apply here. --- --- 3) On non-Windows plaftorms that don't support 'flock' (e.g. Solaris) this --- function throws 'FileLockingNotImplemented'. We deliberately choose to not --- provide fcntl based locking instead because of its broken semantics. --- --- @since 4.10.0.0 -hLock :: Handle -> LockMode -> IO () -hLock h mode = lockImpl h "hLock" mode True >> return () - --- | Non-blocking version of 'hLock'. --- --- @since 4.10.0.0 -hTryLock :: Handle -> LockMode -> IO Bool -hTryLock h mode = lockImpl h "hTryLock" mode False - ----------------------------------------- - -#if defined(solaris2_HOST_OS) - --- | No-op implementation. -lockImpl :: Handle -> String -> LockMode -> Bool -> IO Bool -lockImpl _ _ _ _ = throwIO FileLockingNotSupported - -#else /* !defined(solaris2_HOST_OS) */ - -#if defined(mingw32_HOST_OS) - -lockImpl :: Handle -> String -> LockMode -> Bool -> IO Bool -lockImpl h ctx mode block = do - FD{fdFD = fd} <- handleToFd h - wh <- throwErrnoIf (== iNVALID_HANDLE_VALUE) ctx $ c_get_osfhandle fd - allocaBytes sizeof_OVERLAPPED $ \ovrlpd -> do - fillBytes ovrlpd (fromIntegral sizeof_OVERLAPPED) 0 - let flags = cmode .|. (if block then 0 else #{const LOCKFILE_FAIL_IMMEDIATELY}) - -- We want to lock the whole file without looking up its size to be - -- consistent with what flock does. According to documentation of LockFileEx - -- "locking a region that goes beyond the current end-of-file position is - -- not an error", however e.g. Windows 10 doesn't accept maximum possible - -- value (a pair of MAXDWORDs) for mysterious reasons. Work around that by - -- trying 2^32-1. - fix $ \retry -> c_LockFileEx wh flags 0 0xffffffff 0x0 ovrlpd >>= \case - True -> return True - False -> getLastError >>= \err -> if - | not block && err == #{const ERROR_LOCK_VIOLATION} -> return False - | err == #{const ERROR_OPERATION_ABORTED} -> retry - | otherwise -> failWith ctx err - where - sizeof_OVERLAPPED = #{size OVERLAPPED} - - cmode = case mode of - SharedLock -> 0 - ExclusiveLock -> #{const LOCKFILE_EXCLUSIVE_LOCK} - --- https://msdn.microsoft.com/en-us/library/aa297958.aspx -foreign import ccall unsafe "_get_osfhandle" - c_get_osfhandle :: CInt -> IO HANDLE - --- https://msdn.microsoft.com/en-us/library/windows/desktop/aa365203.aspx -foreign import WINDOWS_CCONV interruptible "LockFileEx" - c_LockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> DWORD -> Ptr () -> IO BOOL - -#else /* !defined(mingw32_HOST_OS), so assume unix with flock() */ - -lockImpl :: Handle -> String -> LockMode -> Bool -> IO Bool -lockImpl h ctx mode block = do - FD{fdFD = fd} <- handleToFd h - let flags = cmode .|. (if block then 0 else #{const LOCK_NB}) - fix $ \retry -> c_flock fd flags >>= \case - 0 -> return True - _ -> getErrno >>= \errno -> if - | not block && errno == eWOULDBLOCK -> return False - | errno == eINTR -> retry - | otherwise -> ioException $ errnoToIOError ctx errno (Just h) Nothing - where - cmode = case mode of - SharedLock -> #{const LOCK_SH} - ExclusiveLock -> #{const LOCK_EX} - -foreign import ccall interruptible "flock" - c_flock :: CInt -> CInt -> IO CInt - -#endif /* !defined(mingw32_HOST_OS) */ - --- | Turn an existing Handle into a file descriptor. This function throws an --- IOError if the Handle does not reference a file descriptor. -handleToFd :: Handle -> IO FD -handleToFd h = case h of - FileHandle _ mv -> do - Handle__{haDevice = dev} <- readMVar mv - case cast dev of - Just fd -> return fd - Nothing -> throwErr "not a file descriptor" - DuplexHandle{} -> throwErr "not a file handle" - where - throwErr msg = ioException $ IOError (Just h) - InappropriateType "handleToFd" msg Nothing Nothing - -#endif /* defined(solaris2_HOST_OS) */ - -#endif /* MIN_VERSION_base */ diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/HttpUtils.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/HttpUtils.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/HttpUtils.hs 2019-11-06 07:30:01.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/HttpUtils.hs 2019-11-16 12:22:27.000000000 +0000 @@ -14,8 +14,9 @@ isOldHackageURI ) where -import Prelude (head) +import Prelude () import Distribution.Client.Compat.Prelude hiding (Proxy (..)) +import Distribution.Utils.Generic import Network.HTTP ( Request (..), Response (..), RequestMethod (..) @@ -38,7 +39,7 @@ import Distribution.Verbosity (Verbosity) import Distribution.Pretty (prettyShow) import Distribution.Simple.Utils - ( die', info, warn, debug, notice, writeFileAtomic + ( die', info, warn, debug, notice , copyFileVerbose, withTempFile ) import Distribution.Client.Utils ( withTempFileName ) @@ -305,8 +306,8 @@ [ (name, transport) | (name, _, _, mkTrans) <- supportedTransports , transport <- maybeToList (mkTrans progdb) ] - -- there's always one because the plain one is last and never fails - let (name, transport) = head availableTransports + let (name, transport) = + fromMaybe ("plain-http", plainHttpTransport) (safeHead availableTransports) debug verbosity $ "Selected http transport implementation: " ++ name return transport { transportManuallySelected = False } diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Init/Heuristics.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Init/Heuristics.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Init/Heuristics.hs 2019-11-06 07:30:01.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Init/Heuristics.hs 2019-11-16 12:22:27.000000000 +0000 @@ -20,9 +20,9 @@ knownCategories, ) where -import Prelude (head, last) +import Prelude () import Distribution.Client.Compat.Prelude -import Distribution.Utils.Generic (safeHead, safeTail) +import Distribution.Utils.Generic (safeHead, safeTail, safeLast) import Distribution.Parsec (simpleParsec) import Distribution.Simple.Setup (Flag(..), flagToMaybe) @@ -87,7 +87,7 @@ -- | Guess the package name based on the given root directory. guessPackageName :: FilePath -> IO P.PackageName -guessPackageName = liftM (P.mkPackageName . repair . last . splitDirectories) +guessPackageName = liftM (P.mkPackageName . repair . fromMaybe "" . safeLast . splitDirectories) . tryCanonicalizePath where -- Treat each span of non-alphanumeric characters as a hyphen. Each @@ -346,7 +346,7 @@ -- |Get list of categories used in Hackage. NOTE: Very slow, needs to be cached knownCategories :: SourcePackageDb -> [String] knownCategories (SourcePackageDb sourcePkgIndex _) = nubSet - [ cat | pkg <- map head (allPackagesByName sourcePkgIndex) + [ cat | pkg <- maybeToList . safeHead =<< (allPackagesByName sourcePkgIndex) , let catList = (PD.category . PD.packageDescription . packageDescription) pkg , cat <- splitString ',' catList ] diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Outdated.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Outdated.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Outdated.hs 2019-11-06 07:30:01.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Outdated.hs 2019-11-16 12:22:27.000000000 +0000 @@ -13,7 +13,7 @@ , ListOutdatedSettings(..), listOutdated ) where -import Prelude (last) +import Prelude () import Distribution.Client.Config import Distribution.Client.IndexUtils as IndexUtils import Distribution.Client.Compat.Prelude @@ -26,6 +26,7 @@ import Distribution.Solver.Types.PackageConstraint import Distribution.Solver.Types.PackageIndex import Distribution.Client.Sandbox.PackageEnvironment +import Distribution.Utils.Generic import Distribution.Package (PackageName, packageVersion) import Distribution.PackageDescription (allBuildDepends) @@ -204,7 +205,8 @@ relaxMinor :: VersionRange -> VersionRange relaxMinor vr = let vis = asVersionIntervals vr - (LowerBound v0 _,upper) = last vis - in case upper of - NoUpperBound -> vr - UpperBound _v1 _ -> majorBoundVersion v0 + in maybe vr relax (safeLast vis) + where relax (LowerBound v0 _, upper) = + case upper of + NoUpperBound -> vr + UpperBound _v1 _ -> majorBoundVersion v0 diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/SetupWrapper.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/SetupWrapper.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/SetupWrapper.hs 2019-11-06 07:30:02.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/SetupWrapper.hs 2019-11-16 12:22:27.000000000 +0000 @@ -22,7 +22,7 @@ defaultSetupScriptOptions, ) where -import Prelude (head) +import Prelude () import Distribution.Client.Compat.Prelude import qualified Distribution.Make as Make @@ -81,6 +81,8 @@ ( Lock, criticalSection ) import Distribution.Simple.Setup ( Flag(..) ) +import Distribution.Utils.Generic + ( safeHead ) import Distribution.Simple.Utils ( die', debug, info, infoNoWrap , cabalVersion, tryFindPackageDesc, comparing @@ -726,7 +728,8 @@ ++ "' requires Cabal library version " ++ display (useCabalVersion options) ++ " but no suitable version is installed." - pkgs -> let ipkginfo = head . snd . bestVersion fst $ pkgs + pkgs -> let ipkginfo = fromMaybe err $ safeHead . snd . bestVersion fst $ pkgs + err = error "Distribution.Client.installedCabalVersion: empty version list" in return (packageVersion ipkginfo ,Just . IPI.installedComponentId $ ipkginfo, options'') diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/SourceFiles.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/SourceFiles.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/SourceFiles.hs 2019-11-06 07:30:02.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/SourceFiles.hs 2019-11-16 12:22:27.000000000 +0000 @@ -17,7 +17,6 @@ import Distribution.Solver.Types.OptionalStanza -import Distribution.Simple.Glob import Distribution.Simple.PreProcess import Distribution.Types.PackageDescription @@ -34,14 +33,11 @@ import Distribution.ModuleName -import Distribution.Verbosity (silent) - import Prelude () import Distribution.Client.Compat.Prelude import System.FilePath import Control.Monad -import Control.Monad.IO.Class import qualified Data.Set as Set needElaboratedConfiguredPackage :: ElaboratedConfiguredPackage -> Rebuild () @@ -156,9 +152,7 @@ -- compilation). It would be even better if we knew on a -- per-component basis which headers would be used but that -- seems to be too difficult. - forM_ (extraSrcFiles pkg_descr) $ \ glob -> do - files <- liftIO $ matchDirFileGlob silent (specVersion pkg_descr) "." glob - mapM_ needIfExists (filter ((==".h").takeExtension) files) + mapM_ needIfExists (filter ((==".h").takeExtension) (extraSrcFiles pkg_descr)) forM_ (installIncludes bi) $ \f -> findFileMonitored ("." : includeDirs bi) f >>= maybe (return ()) need diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Store.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Store.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Client/Store.hs 2019-11-06 07:30:02.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Client/Store.hs 2019-11-16 12:22:27.000000000 +0000 @@ -1,4 +1,4 @@ -{-# LANGUAGE RecordWildCards, NamedFieldPuns #-} +{-# LANGUAGE CPP, RecordWildCards, NamedFieldPuns #-} -- | Management for the installed package store. @@ -23,7 +23,6 @@ import Prelude () import Distribution.Client.Compat.Prelude -import Distribution.Client.Compat.FileLock import Distribution.Client.DistDirLayout import Distribution.Client.RebuildMonad @@ -41,8 +40,16 @@ import Control.Monad (forM_) import System.FilePath import System.Directory -import System.IO +#ifdef MIN_VERSION_lukko +import Lukko +#else +import System.IO (openFile, IOMode(ReadWriteMode), hClose) +import GHC.IO.Handle.Lock (hLock, hTryLock, LockMode(ExclusiveLock)) +#if MIN_VERSION_base(4,11,0) +import GHC.IO.Handle.Lock (hUnlock) +#endif +#endif -- $concurrency -- @@ -235,6 +242,26 @@ compid unitid action = bracket takeLock releaseLock (\_hnd -> action) where +#ifdef MIN_VERSION_lukko + takeLock + | fileLockingSupported = do + fd <- fdOpen (storeIncomingLock compid unitid) + gotLock <- fdTryLock fd ExclusiveLock + unless gotLock $ do + info verbosity $ "Waiting for file lock on store entry " + ++ display compid display unitid + fdLock fd ExclusiveLock + return fd + + -- if there's no locking, do nothing. Be careful on AIX. + | otherwise = return undefined -- :( + + releaseLock fd + | fileLockingSupported = do + fdUnlock fd + fdClose fd + | otherwise = return () +#else takeLock = do h <- openFile (storeIncomingLock compid unitid) ReadWriteMode -- First try non-blocking, but if we would have to wait then @@ -246,5 +273,5 @@ hLock h ExclusiveLock return h - releaseLock = hClose - + releaseLock h = hUnlock h >> hClose h +#endif diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Deprecated/ViewAsFieldDescr.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Deprecated/ViewAsFieldDescr.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/Distribution/Deprecated/ViewAsFieldDescr.hs 2019-11-06 07:30:01.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/Distribution/Deprecated/ViewAsFieldDescr.hs 2019-11-16 12:22:27.000000000 +0000 @@ -3,8 +3,9 @@ ) where import Distribution.Client.Compat.Prelude hiding (get) -import Prelude (head) +import Prelude () +import qualified Data.List.NonEmpty as NE import Distribution.Parsec (parsec) import Distribution.Pretty import Distribution.ReadE (parsecToReadE) @@ -19,10 +20,10 @@ viewAsFieldDescr :: OptionField a -> FieldDescr a viewAsFieldDescr (OptionField _n []) = error "Distribution.command.viewAsFieldDescr: unexpected" -viewAsFieldDescr (OptionField n dd) = FieldDescr n get set +viewAsFieldDescr (OptionField n (d:dd)) = FieldDescr n get set where - optDescr = head $ sortBy cmp dd + optDescr = head $ NE.sortBy cmp (d:|dd) cmp :: OptDescr a -> OptDescr a -> Ordering ReqArg{} `cmp` ReqArg{} = EQ diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/main/Main.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/main/Main.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/main/Main.hs 2019-11-06 07:30:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/main/Main.hs 2019-11-16 12:22:27.000000000 +0000 @@ -67,7 +67,7 @@ , configAbsolutePaths ) -import Prelude (head, tail) +import Prelude () import Distribution.Solver.Compat.Prelude hiding (get) import Distribution.Client.SetupWrapper @@ -236,9 +236,9 @@ mainWorker :: [String] -> IO () mainWorker args = do - hasScript <- if not (null args) - then CmdRun.validScript (head args) - else return False + maybeScriptAndArgs <- case args of + [] -> return Nothing + (h:tl) -> (\b -> if b then Just (h:|tl) else Nothing) <$> CmdRun.validScript h topHandler $ case commandsRun (globalCommand commands) commands args of @@ -253,9 +253,8 @@ -> printNumericVersion CommandHelp help -> printCommandHelp help CommandList opts -> printOptionsList opts - CommandErrors errs - | hasScript -> CmdRun.handleShebang (head args) (tail args) - | otherwise -> printErrors errs + CommandErrors errs -> maybe (printErrors errs) go maybeScriptAndArgs where + go (script:|scriptArgs) = CmdRun.handleShebang script scriptArgs CommandReadyToGo action -> do globalFlags' <- updateSandboxConfigFileFlag globalFlags action globalFlags' diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/tests/README.md cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/tests/README.md --- cabal-install-head-3.1+git20191103.2.129775a/src/cabal-install-3.1.0.0/tests/README.md 2019-11-06 07:30:03.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/cabal-install-3.1.0.0/tests/README.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Integration Tests -================= - -Each test is a shell script. Tests that share files (e.g., `.cabal` files) are -grouped under a common sub-directory of [IntegrationTests]. The framework -copies the whole group's directory before running each test, which allows tests -to reuse files, yet run independently. A group's tests are further divided into -`should_run` and `should_fail` directories, based on the expected exit status. -For example, the test -`IntegrationTests/exec/should_fail/exit_with_failure_without_args.sh` has access -to all files under `exec` and is expected to fail. - -Tests can specify their expected output. For a test named `x.sh`, `x.out` -specifies `stdout` and `x.err` specifies `stderr`. Both files are optional. -The framework expects an exact match between lines in the file and output, -except for lines beginning with "RE:", which are interpreted as regular -expressions. - -[IntegrationTests.hs] defines several environment variables: - -* `CABAL` - The path to the executable being tested. -* `GHC_PKG` - The path to ghc-pkg. -* `CABAL_ARGS` - A common set of arguments for running cabal. -* `CABAL_ARGS_NO_CONFIG_FILE` - `CABAL_ARGS` without `--config-file`. - -[IntegrationTests]: IntegrationTests -[IntegrationTests.hs]: IntegrationTests.hs diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/cbits/windows.c cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/cbits/windows.c --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/cbits/windows.c 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/cbits/windows.c 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,30 @@ +#include + +// from https://github.com/ghc/ghc/blob/4b431f334018eaef2cf36de3316025c68c922915/utils/fs/fs.c +HANDLE *fdOpen(LPCWSTR filename) { + // Construct access mode. + // https://docs.microsoft.com/en-us/windows/win32/fileio/file-access-rights-constants + DWORD dwDesiredAccess = GENERIC_WRITE | GENERIC_READ; + + // Construct shared mode. + // https://docs.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants + DWORD dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + + // Create file disposition. + // https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew + DWORD dwCreationDisposition = OPEN_ALWAYS; + + // Set file access attributes. + DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL; + + SECURITY_ATTRIBUTES securityAttributes; + ZeroMemory (&securityAttributes, sizeof(SECURITY_ATTRIBUTES)); + securityAttributes.bInheritHandle = TRUE; // not sure what should be here + securityAttributes.lpSecurityDescriptor = NULL; + securityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + + HANDLE res = CreateFileW(filename, dwDesiredAccess, dwShareMode, &securityAttributes, + dwCreationDisposition, dwFlagsAndAttributes, NULL); + + return res; +} diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/LICENSE cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/LICENSE --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/LICENSE 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,52 @@ +SPDX-License-Identifier: GPL-2.0-or-later AND BSD-3-Clause + +Copyright (c) 2019 Oleg Grenrus + + This library is free software: you may copy, redistribute and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program (see `LICENSE.GPLv3`). If not, see + . + +This library incorporates work covered by the following copyright and +permission notice: + + The Glasgow Haskell Compiler License + + Copyright 2004, The University Court of the University of Glasgow. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + - Neither name of the University nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF + GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/LICENSE.GPLv2 cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/LICENSE.GPLv2 --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/LICENSE.GPLv2 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/LICENSE.GPLv2 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,348 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + + + + + + + + + diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/LICENSE.GPLv3 cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/LICENSE.GPLv3 --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/LICENSE.GPLv3 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/LICENSE.GPLv3 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,678 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + + + + diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/lukko.cabal cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/lukko.cabal --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/lukko.cabal 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/lukko.cabal 2019-11-16 12:22:33.000000000 +0000 @@ -0,0 +1,153 @@ +cabal-version: 2.2 +name: lukko +version: 0.1 +synopsis: File locking +category: System, Concurrency +description: + This package provides access to platform dependent file locking APIs: + . + * Open file descriptor locking on Linux ("Lukko.OFD") + * @flock@ locking on unix platforms ("Lukko.FLock") + * Windows locking @LockFileEx@ ("Lukko.Windows") + * No-op locking, which throws exceptions ("Lukko.NoOp") + * "Lukko" module exports the best option for the target platform with uniform API. + . + There are alternative file locking packages: + . + * "GHC.IO.Handle.Lock" in @base >= 4.10@ is good enough for most use cases. + However, uses only 'Handle's so these locks cannot be used for intra-process locking. + (You should use e.g. 'MVar' in addition). + . + * doesn't support OFD locking. + . + /Lukko/ means lock in Finnish. + . + Submodules "Lukko.OFD", "Lukko.Windows" etc are available based on following conditions. + . + @ + if os(windows) + \ cpp-options: -DHAS_WINDOWS_LOCK + . + elif (os(linux) && flag(ofd-locking)) + \ cpp-options: -DHAS_OFD_LOCKING + \ cpp-options: -DHAS_FLOCK + . + elif !(os(solaris) || os(aix)) + \ cpp-options: -DHAS_FLOCK + @ + . + "Lukko.FLock" is available on not (Windows or Solaris or AIX). + "Lukko.NoOp" is always available. + +maintainer: Oleg Grenrus +license: GPL-2.0-or-later AND BSD-3-Clause +license-files: LICENSE LICENSE.GPLv2 LICENSE.GPLv3 +build-type: Simple +tested-with: + GHC ==7.6.3 + || ==7.8.4 + || ==7.10.3 + || ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.1 + +source-repository head + type: git + location: https://github.com/phadej/lukko/ + +flag ofd-locking + default: True + manual: True + description: + Enable open file descriptor locking. Available on Linux (kernel 3.15, released Jun 8, 2014). + +library + default-language: Haskell2010 + hs-source-dirs: src + build-depends: base >=4.5 && <4.14 + build-tool-depends: hsc2hs:hsc2hs >=0.67 && <0.69 + + -- Main library module + exposed-modules: + Lukko + Lukko.NoOp + + if os(windows) + hs-source-dirs: src-windows + cpp-options: -DUSE_WINDOWS_LOCK + exposed-modules: Lukko.Windows + c-sources: cbits/windows.c + + elif (os(linux) && flag(ofd-locking)) + hs-source-dirs: src-ofd + hs-source-dirs: src-flock + hs-source-dirs: src-unix + cpp-options: -DUSE_OFD_LOCKING + exposed-modules: Lukko.OFD + + elif !(os(solaris) || os(aix)) + hs-source-dirs: src-flock + hs-source-dirs: src-unix + cpp-options: -DUSE_FLOCK + + else + hs-source-dirs: src-unix + cpp-options: -DUSE_NOOP + + -- Cabal check is silly + if (!os(windows) && !(os(solaris) || os(aix))) + exposed-modules: Lukko.FLock + + other-modules: + Lukko.Internal.FD + Lukko.Internal.FillBytes + Lukko.Internal.HandleToFD + Lukko.Internal.Types + +test-suite test-thread + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Tests.hs + ghc-options: -threaded + build-depends: + , async ^>=2.2.2 + , base + , filepath ^>=1.3.0.0 || ^>=1.4.0.0 + , lukko + , tasty ^>=1.2.3 + , tasty-hunit ^>=0.10.0.2 + , temporary ^>=1.3 + + if os(windows) + cpp-options: -DHAS_WINDOWS_LOCK + + elif (os(linux) && flag(ofd-locking)) + cpp-options: -DHAS_OFD_LOCKING + cpp-options: -DHAS_FLOCK + + elif !(os(solaris) || os(aix)) + cpp-options: -DHAS_FLOCK + +test-suite test-process + default-language: Haskell2010 + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: TestProcess.hs + ghc-options: -threaded + build-depends: + , base + , bytestring >=0.9.2.1 && <0.11 + , lukko + + if os(windows) + cpp-options: -DHAS_WINDOWS_LOCK + + elif (os(linux) && flag(ofd-locking)) + cpp-options: -DHAS_OFD_LOCKING + cpp-options: -DHAS_FLOCK + + elif !(os(solaris) || os(aix)) + cpp-options: -DHAS_FLOCK diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/Internal/FillBytes.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/Internal/FillBytes.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/Internal/FillBytes.hs 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/Internal/FillBytes.hs 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,21 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE InterruptibleFFI #-} +{-# LANGUAGE Trustworthy #-} +module Lukko.Internal.FillBytes (fillBytes) where + +#if MIN_VERSION_base(4,8,0) +import Foreign.Marshal.Utils (fillBytes) +#else +import Data.Word (Word8) +import Foreign.C.Types (CInt (..), CSize (..)) +import Foreign.Ptr (Ptr (..)) +#endif + +#if !MIN_VERSION_base(4,8,0) +fillBytes :: Ptr a -> Word8 -> Int -> IO () +fillBytes dest char size = do + _ <- memset dest (fromIntegral char) (fromIntegral size) + return () + +foreign import ccall unsafe "string.h" memset :: Ptr a -> CInt -> CSize -> IO (Ptr a) +#endif diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/Internal/HandleToFD.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/Internal/HandleToFD.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/Internal/HandleToFD.hs 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/Internal/HandleToFD.hs 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,32 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE Trustworthy #-} +module Lukko.Internal.HandleToFD (ghcHandleToFd) where + +import qualified GHC.IO.FD as GHC (FD (..)) +import System.IO (Handle) + +#if MIN_VERSION_base(4,10,0) +import qualified GHC.IO.Handle.FD as GHC (handleToFd) +#else +import Control.Concurrent.MVar (readMVar) +import Data.Typeable (cast) +import GHC.IO.Exception +import GHC.IO.Handle.Internals +import GHC.IO.Handle.Types +#endif + +ghcHandleToFd :: Handle -> IO GHC.FD +#if MIN_VERSION_base(4,10,0) +ghcHandleToFd = GHC.handleToFd +#else +ghcHandleToFd h = case h of + FileHandle _ mv -> do + Handle__{haDevice = dev} <- readMVar mv + case cast dev of + Just fd -> return fd + Nothing -> throwErr "not a file descriptor" + DuplexHandle{} -> throwErr "not a file handle" + where + throwErr msg = ioException $ IOError (Just h) + InappropriateType "handleToFd" msg Nothing Nothing +#endif diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/Internal/Types.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/Internal/Types.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/Internal/Types.hs 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/Internal/Types.hs 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,25 @@ +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE Safe #-} +module Lukko.Internal.Types where + +import Control.Exception (Exception) +import Data.Typeable (Typeable) + +-- | Exception thrown by 'hLock' on non-Windows platforms that don't support +-- @flock@. +data FileLockingNotSupported = FileLockingNotSupported + deriving (Typeable, Show) + +instance Exception FileLockingNotSupported + +-- | Indicates a mode in which a file should be locked. +data LockMode = SharedLock | ExclusiveLock + deriving (Typeable) + +-- | Potentially availble lock methods. +data FileLockingMethod + = MethodOFD -- ^ open file descriptor locking + | MethodFLock -- ^ BSD @flock@ + | MethodWindows -- ^ Windows locking + | MethodNoOp -- ^ No-Op (throws 'FileLockingNotSupported') + deriving (Typeable, Eq, Ord, Enum, Bounded, Show) diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/NoOp.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/NoOp.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko/NoOp.hs 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko/NoOp.hs 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,62 @@ +{-# LANGUAGE DataKinds #-} +{-# LANGUAGE Safe #-} +-- | Non-operating locks. +-- +-- All functions throw 'FileLockingNotImplemented'. +module Lukko.NoOp ( + -- * Types + FileLockingNotSupported(..), + fileLockingSupported, + FileLockingMethod (..), + fileLockingMethod, + LockMode(..), + -- * File descriptors + FD, + fdOpen, + fdClose, + fdLock, + fdTryLock, + fdUnlock, + -- * Handles + hLock, + hTryLock, + hUnlock, + ) where + +import Control.Exception (throwIO) +import System.IO (Handle) + +import Lukko.Internal.FD +import Lukko.Internal.Types + +-- | A constants specifying whether file locking is supported. +fileLockingSupported :: Bool +fileLockingSupported = False + +-- | A constant specifying this method +fileLockingMethod :: FileLockingMethod +fileLockingMethod = MethodNoOp + +-- | No-op implementation. +hLock :: Handle -> LockMode -> IO () +hLock _ _ = throwIO FileLockingNotSupported + +-- | No-op implementation +hTryLock :: Handle -> LockMode -> IO Bool +hTryLock _ _ = throwIO FileLockingNotSupported + +-- | No-op implementation. +hUnlock :: Handle -> IO () +hUnlock _ = throwIO FileLockingNotSupported + +-- | No-op implementation. +fdLock :: FD -> LockMode -> IO () +fdLock _ _ = throwIO FileLockingNotSupported + +-- | No-op implementation +fdTryLock :: FD -> LockMode -> IO Bool +fdTryLock _ _ = throwIO FileLockingNotSupported + +-- | No-op implementation. +fdUnlock :: FD -> IO () +fdUnlock _ = throwIO FileLockingNotSupported diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src/Lukko.hs 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src/Lukko.hs 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,145 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE Trustworthy #-} +-- | Open 'Handle' based locking +module Lukko ( + FileLockingNotSupported(..), + Impl.fileLockingSupported, + FileLockingMethod (..), + Impl.fileLockingMethod, + LockMode(..), + -- * File descriptors + FD, + fdOpen, + fdClose, + fdLock, + fdTryLock, + fdUnlock, + -- * Handles + handleToFd, + hLock, + hTryLock, + hUnlock, + ) where + +{- Parts of these software is derived from GHC sources + distributed under BSD-3-Clause license: + +The Glasgow Haskell Compiler License + +Copyright 2004, The University Court of the University of Glasgow. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +- Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +- Neither name of the University nor the names of its contributors may be +used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF +GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +-} + +import Control.Monad (void) +import System.IO (Handle) + +import Lukko.Internal.Types + +import qualified Lukko.Internal.FD as Impl + +#if defined(USE_OFD_LOCKING) +import qualified Lukko.OFD as Impl +#elif defined(USE_FLOCK) +import qualified Lukko.FLock as Impl +#elif defined(USE_WINDOWS_LOCK) +import qualified Lukko.Windows as Impl +#else +import qualified Lukko.NoOp as Impl +#endif + +------------------------------------------------------------------------------- +-- Handles +------------------------------------------------------------------------------- + +-- | If a 'Handle' references a file descriptor, attempt to lock contents of the +-- underlying file in appropriate mode. If the file is already locked in +-- incompatible mode, this function blocks until the lock is established. The +-- lock is automatically released upon closing a 'Handle'. +-- +-- Things to be aware of: +-- +-- 1) This function may block inside a C call. If it does, in order to be able +-- to interrupt it with asynchronous exceptions and/or for other threads to +-- continue working, you MUST use threaded version of the runtime system. +-- +-- 2) The implementation uses 'LockFileEx' on Windows, +-- /open file descriptor/ locks on Linux, and 'flock' otherwise, +-- hence all of their caveats also apply here. +-- +-- 3) On non-Windows plaftorms that don't support 'flock' (e.g. Solaris) this +-- function throws 'FileLockingNotImplemented'. We deliberately choose to not +-- provide @fcntl@ based locking instead because of its broken semantics. +-- +hLock :: Handle -> LockMode -> IO () +hLock = Impl.hLock + +-- | Non-blocking version of 'hLock'. +hTryLock :: Handle -> LockMode -> IO Bool +hTryLock = Impl.hTryLock + +-- | Release a lock taken with 'hLock' or 'hTryLock'. +hUnlock :: Handle -> IO () +hUnlock = Impl.hUnlock + +------------------------------------------------------------------------------- +-- File descriptors +------------------------------------------------------------------------------- + +-- | Opaque /file descriptor/ +-- +-- An @int@ / 'CInt' on unix systems, +-- and 'HANDLE' on windows. +type FD = Impl.FD + +-- | Open file to be used for locking. +fdOpen :: FilePath -> IO FD +fdOpen = Impl.fdOpen + +-- | Close lock file. +fdClose :: FD -> IO () +fdClose = Impl.fdClose + +-- | Convert GHC 'Handle' to lukko 'FD'. +handleToFd :: Handle -> IO FD +handleToFd = Impl.handleToFd + +-- | Like 'hLock', but work on "raw" file descriptor, +-- as handled by 'fdOpen' and 'fdClose'. +fdLock :: Impl.FD -> LockMode -> IO () +fdLock = Impl.fdLock + +-- | Non-blocking version of 'fdLock'. +fdTryLock :: Impl.FD -> LockMode -> IO Bool +fdTryLock = Impl.fdTryLock + +-- | Release a lock taken with 'fdLock' or 'fdTryLock'. +fdUnlock :: Impl.FD -> IO () +fdUnlock = Impl.fdUnlock diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-flock/Lukko/FLock.hsc cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-flock/Lukko/FLock.hsc --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-flock/Lukko/FLock.hsc 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-flock/Lukko/FLock.hsc 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,118 @@ +{-# LANGUAGE InterruptibleFFI #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE Trustworthy #-} +-- | File locking via POSIX @flock@. +module Lukko.FLock ( + -- * Types + FileLockingNotSupported(..), + fileLockingSupported, + FileLockingMethod (..), + fileLockingMethod, + LockMode(..), + -- * File descriptors + FD, + fdOpen, + fdClose, + fdLock, + fdTryLock, + fdUnlock, + -- * Handles + hLock, + hTryLock, + hUnlock, + ) where + +#include + +import Control.Monad (void) +import System.IO (Handle) + +import Data.Bits +import Data.Function +import Foreign.C.Error +import Foreign.C.Types +import GHC.Base +import GHC.IO.Exception + +import Lukko.Internal.FD +import Lukko.Internal.Types + +------------------------------------------------------------------------------- +-- Support constants +------------------------------------------------------------------------------- + +-- | A constants specifying whether file locking is supported. +fileLockingSupported :: Bool +fileLockingSupported = True + +-- | A constant specifying this method +fileLockingMethod :: FileLockingMethod +fileLockingMethod = MethodFLock + +------------------------------------------------------------------------------- +-- FD +------------------------------------------------------------------------------- + +-- | Lock using OFD locks. +fdLock :: FD -> LockMode -> IO () +fdLock fd mode = void (lockImpl Nothing fd "fdLock" mode True) + +-- | Try to lock using OFD locks. +fdTryLock :: FD -> LockMode -> IO Bool +fdTryLock fd mode = lockImpl Nothing fd "fdTryLock" mode False + +-- | Unlock using OFD locks. +fdUnlock :: FD -> IO () +fdUnlock = unlockImpl + +------------------------------------------------------------------------------- +-- Handle +------------------------------------------------------------------------------- + +-- | Lock using OFD locks. +hLock :: Handle -> LockMode -> IO () +hLock h mode = do + fd <- handleToFd h + void (lockImpl (Just h) fd "hLock" mode True) + +-- | Try to lock using OFD locks. +hTryLock :: Handle -> LockMode -> IO Bool +hTryLock h mode = do + fd <- handleToFd h + lockImpl (Just h) fd "hTryLock" mode False + +-- | Unlock using OFD locks. +hUnlock :: Handle -> IO () +hUnlock h = do + fd <- handleToFd h + unlockImpl fd + +------------------------------------------------------------------------------- +-- Compat stuff +------------------------------------------------------------------------------- + +------------------------------------------------------------------------------- +-- implementation +------------------------------------------------------------------------------- + +lockImpl :: Maybe Handle -> FD -> String -> LockMode -> Bool -> IO Bool +lockImpl mh (FD fd) ctx mode block = do + let flags = cmode .|. (if block then 0 else #{const LOCK_NB}) + fix $ \retry -> c_flock fd flags >>= \res -> case res of + 0 -> return True + _ -> getErrno >>= \errno -> case () of + _ | not block + , errno == eAGAIN || errno == eACCES -> return False + | errno == eINTR -> retry + | otherwise -> ioException $ errnoToIOError ctx errno mh Nothing + where + cmode = case mode of + SharedLock -> #{const LOCK_SH} + ExclusiveLock -> #{const LOCK_EX} + +unlockImpl :: FD -> IO () +unlockImpl (FD fd) = do + throwErrnoIfMinus1_ "flock" $ c_flock fd #{const LOCK_UN} + +foreign import ccall interruptible "flock" + c_flock :: CInt -> CInt -> IO CInt diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-ofd/Lukko/OFD.hsc cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-ofd/Lukko/OFD.hsc --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-ofd/Lukko/OFD.hsc 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-ofd/Lukko/OFD.hsc 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,174 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE InterruptibleFFI #-} +{-# LANGUAGE Trustworthy #-} +-- | Linux open file descriptor locking. +-- +-- +-- +-- We prefer this over BSD locking (e.g. flock) since the latter appears to +-- break in some NFS configurations. Note that we intentionally do not try to +-- use ordinary POSIX file locking due to its peculiar semantics under +-- multi-threaded environments. +-- +module Lukko.OFD ( + -- * Types + FileLockingNotSupported(..), + fileLockingSupported, + FileLockingMethod (..), + fileLockingMethod, + LockMode(..), + -- * File descriptors + FD, + fdOpen, + fdClose, + fdLock, + fdTryLock, + fdUnlock, + -- * Handles + hLock, + hTryLock, + hUnlock, + ) where + +#define _GNU_SOURCE +#include +#include + +import Control.Monad (void) +import System.IO (Handle) + +import Data.Function +import Foreign.C.Error +import Foreign.C.Types +import Foreign.Marshal.Utils +import Foreign.Storable +import GHC.IO.Exception +import GHC.Ptr +import System.Posix.Types (COff, CPid) + +import Lukko.Internal.FD +import Lukko.Internal.FillBytes +import Lukko.Internal.Types + +------------------------------------------------------------------------------- +-- Support constants +------------------------------------------------------------------------------- + +-- | A constants specifying whether file locking is supported. +fileLockingSupported :: Bool +fileLockingSupported = True + +-- | A constant specifying this method +fileLockingMethod :: FileLockingMethod +fileLockingMethod = MethodOFD + +------------------------------------------------------------------------------- +-- FD +------------------------------------------------------------------------------- + +-- | Lock using OFD locks. +fdLock :: FD -> LockMode -> IO () +fdLock fd mode = void (lockImpl Nothing fd "fdLock" mode True) + +-- | Try to lock using OFD locks. +fdTryLock :: FD -> LockMode -> IO Bool +fdTryLock fd mode = lockImpl Nothing fd "fdTryLock" mode False + +-- | Unlock using OFD locks. +fdUnlock :: FD -> IO () +fdUnlock = unlockImpl + +------------------------------------------------------------------------------- +-- Handle +------------------------------------------------------------------------------- + +-- | Lock using OFD locks. +hLock :: Handle -> LockMode -> IO () +hLock h mode = do + fd <- handleToFd h + void (lockImpl (Just h) fd "hLock" mode True) + +-- | Try to lock using OFD locks. +hTryLock :: Handle -> LockMode -> IO Bool +hTryLock h mode = do + fd <- handleToFd h + lockImpl (Just h) fd "hTryLock" mode False + +-- | Unlock using OFD locks. +hUnlock :: Handle -> IO () +hUnlock h = do + fd <- handleToFd h + unlockImpl fd + +------------------------------------------------------------------------------- +-- Compat +------------------------------------------------------------------------------- + +-- there is no alignment in old hsc2hs +#let alignmentcompat t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) + +------------------------------------------------------------------------------- +-- implementation +------------------------------------------------------------------------------- + +foreign import ccall interruptible "fcntl" + c_fcntl :: CInt -> CInt -> Ptr FLock -> IO CInt + +data FLock = FLock { l_type :: CShort + , l_whence :: CShort + , l_start :: COff + , l_len :: COff + , l_pid :: CPid + } + +instance Storable FLock where + sizeOf _ = #{size struct flock} + alignment _ = #{alignmentcompat struct flock} + poke ptr x = do + fillBytes ptr 0 (sizeOf x) + #{poke struct flock, l_type} ptr (l_type x) + #{poke struct flock, l_whence} ptr (l_whence x) + #{poke struct flock, l_start} ptr (l_start x) + #{poke struct flock, l_len} ptr (l_len x) + #{poke struct flock, l_pid} ptr (l_pid x) + peek ptr = do + x1 <- #{peek struct flock, l_type} ptr + x2 <- #{peek struct flock, l_whence} ptr + x3 <- #{peek struct flock, l_start} ptr + x4 <- #{peek struct flock, l_len} ptr + x5 <- #{peek struct flock, l_pid} ptr + return (FLock x1 x2 x3 x4 x5) + +lockImpl :: Maybe Handle -> FD -> String -> LockMode -> Bool -> IO Bool +lockImpl mh (FD fd) ctx mode block = do + with flock $ \flock_ptr -> fix $ \retry -> do + ret <- c_fcntl fd mode' flock_ptr + case ret of + 0 -> return True + _ -> getErrno >>= \errno -> case () of + _ | not block && errno == eWOULDBLOCK -> return False + | errno == eINTR -> retry + | otherwise -> ioException $ errnoToIOError ctx errno mh Nothing + where + flock = FLock { l_type = case mode of + SharedLock -> #{const F_RDLCK} + ExclusiveLock -> #{const F_WRLCK} + , l_whence = #{const SEEK_SET} + , l_start = 0 + , l_len = 0 + , l_pid = 0 + } + mode' + | block = #{const F_OFD_SETLKW} + | otherwise = #{const F_OFD_SETLK} + +unlockImpl :: FD -> IO () +unlockImpl (FD fd) = do + let flock = FLock { l_type = #{const F_UNLCK} + , l_whence = #{const SEEK_SET} + , l_start = 0 + , l_len = 0 + , l_pid = 0 + } + throwErrnoIfMinus1_ "hUnlock" + $ with flock $ c_fcntl fd #{const F_OFD_SETLK} diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-unix/Lukko/Internal/FD.hsc cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-unix/Lukko/Internal/FD.hsc --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-unix/Lukko/Internal/FD.hsc 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-unix/Lukko/Internal/FD.hsc 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,63 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE InterruptibleFFI #-} +{-# LANGUAGE Trustworthy #-} +module Lukko.Internal.FD ( + FD (..), + fdOpen, + fdClose, + handleToFd, + ) where + +#include +#include + +import Data.Bits ((.|.)) +import Foreign.C.Error (throwErrnoIfMinus1Retry) +import Foreign.C.Types +import Foreign.C.String (CString, withCString) +import System.IO (Handle) +import System.Posix.Types (CMode (..)) + +import qualified GHC.IO.FD as GHC (FD (..)) + +import Lukko.Internal.HandleToFD (ghcHandleToFd) + +-- | Opaque /file descriptor/ +-- +-- This is a wrapper over 'CInt' +newtype FD = FD CInt + +foreign import ccall interruptible "open" + c_open :: CString -> CInt -> CMode -> IO CInt + +foreign import ccall interruptible "close" + c_close :: CInt -> IO CInt + +-- | Open file to be used for locking. +-- +-- @ +-- open(path, O_RDWR | O_CREAT); +-- @ +fdOpen :: FilePath -> IO FD +fdOpen fp = withCString fp $ \cfp -> do + fd <- throwErrnoIfMinus1Retry "open" $ c_open cfp flags mode + return (FD fd) + where + flags = #{const O_RDWR} .|. #{const O_CREAT} + mode = CMode 0o666 + +-- | Close lock file. +-- +-- @ +-- close(fd); +-- @ +fdClose :: FD -> IO () +fdClose (FD fd) = do + ret <- throwErrnoIfMinus1Retry "close" $ c_close fd + return () + +-- | Convert GHC 'Handle' to lukko 'FD'. +handleToFd :: Handle -> IO FD +handleToFd h = do + GHC.FD {GHC.fdFD = fd} <- ghcHandleToFd h + return (FD fd) diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-windows/Lukko/Internal/FD.hsc cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-windows/Lukko/Internal/FD.hsc --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-windows/Lukko/Internal/FD.hsc 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-windows/Lukko/Internal/FD.hsc 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,86 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE InterruptibleFFI #-} +{-# LANGUAGE Trustworthy #-} +module Lukko.Internal.FD ( + FD (..), + fdOpen, + fdClose, + handleToFd, + ) where + +import System.IO (Handle) +import GHC.Windows (iNVALID_HANDLE_VALUE, HANDLE, LPWSTR, BOOL, getLastError, failWith) +import Foreign.C.Types (CInt (..)) +import Foreign.C.Error (throwErrnoIf) +import Foreign.C.String (withCWString) +import Foreign.Ptr (Ptr) + +import qualified GHC.IO.FD as GHC (FD (..)) + +import Lukko.Internal.HandleToFD (ghcHandleToFd) + +-- | Opaque /file descriptor/ +-- +-- This is a wrapper over 'HANDLE' +newtype FD = FD HANDLE + +-- | Open file to be used for locking +-- +-- @ +-- createFileW(path, +-- GENERIC_WRITE | GENERIC_READ, +-- FILE_SHARE_READ | FILE_SHARE_WRITE, +-- securityAttributes, // bInheritHandle = TRUE +-- OPEN_ALWAYS, +-- FILE_ATTRIBUTE_NORMAL, +-- NULL); +-- @ +fdOpen :: FilePath -> IO FD +fdOpen fp = withCWString fp $ \cfp -> do + fw <- c_fdOpen cfp + if fw /= iNVALID_HANDLE_VALUE + then return (FD fw) + else getLastError >>= failWith "fdOpen" + +-- | Close lock file. +-- +-- @ +-- CloseHandle(h); +-- @ +fdClose :: FD -> IO () +fdClose (FD fw) = do + r <- c_CloseHandle fw + if r + then return () + else getLastError >>= failWith "fdClose" + +-- | Convert GHC 'Handle' to lukko 'FD'. +handleToFd :: Handle -> IO FD +handleToFd h = do + GHC.FD {GHC.fdFD = fd} <- ghcHandleToFd h + wh <- throwErrnoIf (== iNVALID_HANDLE_VALUE) "handleToFd" $ c_get_osfhandle fd + return (FD wh) + +-- https://msdn.microsoft.com/en-us/library/aa297958.aspx +foreign import ccall unsafe "_get_osfhandle" + c_get_osfhandle :: CInt -> IO HANDLE + +-- Opening file is complicated +foreign import ccall interruptible "fdOpen" + c_fdOpen :: LPWSTR -> IO HANDLE + +#if defined(i386_HOST_ARCH) + +-- https://docs.microsoft.com/en-gb/windows/win32/api/handleapi/nf-handleapi-closehandle +foreign import stdcall interruptible "CloseHandle" + c_CloseHandle :: HANDLE -> IO BOOL + +#elif defined(x86_64_HOST_ARCH) + +-- https://docs.microsoft.com/en-gb/windows/win32/api/handleapi/nf-handleapi-closehandle +foreign import ccall interruptible "CloseHandle" + c_CloseHandle :: HANDLE -> IO BOOL + +#else +#error Unknown mingw32 arch +#endif diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-windows/Lukko/Windows.hsc cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-windows/Lukko/Windows.hsc --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/src-windows/Lukko/Windows.hsc 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/src-windows/Lukko/Windows.hsc 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,159 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE InterruptibleFFI #-} +{-# LANGUAGE Trustworthy #-} +-- | File locking for Windows. +module Lukko.Windows ( + -- * Types + FileLockingNotSupported(..), + fileLockingSupported, + FileLockingMethod (..), + fileLockingMethod, + LockMode(..), + -- * File descriptors + FD, + fdOpen, + fdClose, + fdLock, + fdTryLock, + fdUnlock, + -- * Handles + hLock, + hTryLock, + hUnlock, + ) where + +#include + +import Control.Monad (void) +import System.IO (Handle) + +import Data.Bits +import Data.Function +import Foreign.C.Error +import Foreign.C.Types +import Foreign.Marshal.Alloc +import Foreign.Marshal.Utils +import Foreign.Ptr (Ptr) +import GHC.Windows + +import Lukko.Internal.FD +import Lukko.Internal.FillBytes +import Lukko.Internal.Types + +#if defined(i386_HOST_ARCH) +#define WINDOWS_CCONV stdcall +#elif defined(x86_64_HOST_ARCH) +#define WINDOWS_CCONV ccall +#else +#error Unknown mingw32 arch +#endif + +------------------------------------------------------------------------------- +-- Support constants +------------------------------------------------------------------------------- + +-- | A constants specifying whether file locking is supported. +fileLockingSupported :: Bool +fileLockingSupported = True + +-- | A constant specifying this method +fileLockingMethod :: FileLockingMethod +fileLockingMethod = MethodWindows + +------------------------------------------------------------------------------- +-- FD +------------------------------------------------------------------------------- + +-- | Lock using OFD locks. +fdLock :: FD -> LockMode -> IO () +fdLock fd mode = void (lockImpl Nothing fd "fdLock" mode True) + +-- | Try to lock using OFD locks. +fdTryLock :: FD -> LockMode -> IO Bool +fdTryLock fd mode = lockImpl Nothing fd "fdTryLock" mode False + +-- | Unlock using OFD locks. +fdUnlock :: FD -> IO () +fdUnlock = unlockImpl + +------------------------------------------------------------------------------- +-- Handle +------------------------------------------------------------------------------- + +-- | Lock using OFD locks. +hLock :: Handle -> LockMode -> IO () +hLock h mode = do + fd <- handleToFd h + void (lockImpl (Just h) fd "hLock" mode True) + +-- | Try to lock using OFD locks. +hTryLock :: Handle -> LockMode -> IO Bool +hTryLock h mode = do + fd <- handleToFd h + lockImpl (Just h) fd "hTryLock" mode False + +-- | Unlock using OFD locks. +hUnlock :: Handle -> IO () +hUnlock h = do + fd <- handleToFd h + unlockImpl fd + +------------------------------------------------------------------------------- +-- implementation +------------------------------------------------------------------------------- + +lockImpl :: Maybe Handle -> FD -> String -> LockMode -> Bool -> IO Bool +lockImpl _ (FD wh) ctx mode block = do + allocaBytes sizeof_OVERLAPPED $ \ovrlpd -> do + fillBytes ovrlpd 0 sizeof_OVERLAPPED + let flags = cmode .|. (if block then 0 else #{const LOCKFILE_FAIL_IMMEDIATELY}) + -- We want to lock the whole file without looking up its size to be + -- consistent with what flock does. According to documentation of LockFileEx + -- "locking a region that goes beyond the current end-of-file position is + -- not an error", hence we pass maximum value as the number of bytes to + -- lock. + fix $ \retry -> c_LockFileEx wh flags 0 0xffffffff 0xffffffff ovrlpd >>= \res -> case res of + True -> return True + False -> getLastError >>= \err -> case () of + _ | not block && err == #{const ERROR_LOCK_VIOLATION} -> return False + | err == #{const ERROR_OPERATION_ABORTED} -> retry + | otherwise -> failWith ctx err + where + sizeof_OVERLAPPED = #{size OVERLAPPED} + + cmode = case mode of + SharedLock -> 0 + ExclusiveLock -> #{const LOCKFILE_EXCLUSIVE_LOCK} + +unlockImpl :: FD -> IO () +unlockImpl (FD wh) = do + allocaBytes sizeof_OVERLAPPED $ \ovrlpd -> do + fillBytes ovrlpd 0 sizeof_OVERLAPPED + c_UnlockFileEx wh 0 0xffffffff 0xffffffff ovrlpd >>= \res -> case res of + True -> return () + False -> getLastError >>= failWith "fdUnlock" + where + sizeof_OVERLAPPED = #{size OVERLAPPED} +#if defined(i386_HOST_ARCH) + +-- https://docs.microsoft.com/en-gb/windows/win32/api/fileapi/nf-fileapi-lockfileex +foreign import stdcall interruptible "LockFileEx" + c_LockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> DWORD -> Ptr () -> IO BOOL + +-- https://docs.microsoft.com/en-gb/windows/win32/api/fileapi/nf-fileapi-unlockfileex +foreign import stdcall interruptible "UnlockFileEx" + c_UnlockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> Ptr () -> IO BOOL + +#elif defined(x86_64_HOST_ARCH) + +-- https://docs.microsoft.com/en-gb/windows/win32/api/fileapi/nf-fileapi-lockfileex +foreign import ccall interruptible "LockFileEx" + c_LockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> DWORD -> Ptr () -> IO BOOL + +-- https://docs.microsoft.com/en-gb/windows/win32/api/fileapi/nf-fileapi-unlockfileex +foreign import ccall interruptible "UnlockFileEx" + c_UnlockFileEx :: HANDLE -> DWORD -> DWORD -> DWORD -> Ptr () -> IO BOOL + +#else +#error Unknown mingw32 arch +#endif diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/test/TestProcess.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/test/TestProcess.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/test/TestProcess.hs 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/test/TestProcess.hs 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,75 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RankNTypes #-} +module Main (main) where + +import Control.Concurrent (threadDelay) +import Control.Exception (bracket) +import System.Environment (getArgs) +import System.IO (Handle, IOMode (ReadWriteMode), hClose, openFile) + +import qualified Data.ByteString as BS +import qualified Data.ByteString.Char8 as BS8 + +import Lukko + +#ifdef HAS_OFD_LOCKING +import qualified Lukko.OFD as OFD +#endif + +#ifdef HAS_FLOCK +import qualified Lukko.FLock as FLock +#endif + +main :: IO () +main = withArgs $ \withLock -> do + putStrLn "starting..." + withLock $ do + contents <- BS.readFile "test-actual" + threadDelay 10000 -- 10 ms + BS.writeFile "test-actual" $ BS.append contents $ BS8.pack "another line\n" + +withArgs + :: ((forall r. IO r -> IO r) -> IO ()) + -> IO () +withArgs k = do + args <- getArgs + case args of + ["default"] -> k (genWithLock hLock hUnlock "test-lock") +#ifdef HAS_OFD_LOCKING + ["ofd"] -> k (genWithLock OFD.hLock OFD.hUnlock "test-lock") +#endif +#ifdef HAS_FLOCK + ["flock"] -> k (genWithLock FLock.hLock FLock.hUnlock "test-lock") +#endif + ["noop"] -> k (genWithLock noOpLock noOpUnlock "test-lock") + _ -> putStrLn "Unknown paramters. Doing nothing." + +------------------------------------------------------------------------------- +-- copy pasted +------------------------------------------------------------------------------- + +noOpLock :: Handle -> LockMode -> IO () +noOpLock _ _ = return () + +noOpUnlock :: Handle -> IO () +noOpUnlock _ = return () + +genWithLock + :: (Handle -> LockMode -> IO ()) + -> (Handle -> IO ()) + -> FilePath + -> IO a + -> IO a +genWithLock implLock implUnlock fp action = + bracket takeLock releaseLock (const action) + where + takeLock = do + h <- openFile fp ReadWriteMode + implLock h ExclusiveLock + return h + + releaseLock :: Handle -> IO () + releaseLock h = do + implUnlock h + hClose h diff -Nru cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/test/Tests.hs cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/test/Tests.hs --- cabal-install-head-3.1+git20191103.2.129775a/src/lukko-0.1/test/Tests.hs 1970-01-01 00:00:00.000000000 +0000 +++ cabal-install-head-3.1+git20191115.2.eb2f764/src/lukko-0.1/test/Tests.hs 2001-09-09 01:46:40.000000000 +0000 @@ -0,0 +1,77 @@ +{-# LANGUAGE CPP #-} +module Main (main) where + +import Control.Concurrent (threadDelay) +import Control.Concurrent.Async (forConcurrently_) +import Control.Exception (bracket) +import Data.IORef +import System.FilePath (()) +import System.IO + (Handle, IOMode (ReadWriteMode), hClose, openFile) +import System.IO.Temp (withSystemTempDirectory) +import Test.Tasty (TestTree, defaultMain, testGroup) +import Test.Tasty.HUnit (testCase, (@=?)) + +import Lukko + +#ifdef HAS_OFD_LOCKING +import qualified Lukko.OFD as OFD +#endif + +#ifdef HAS_FLOCK +import qualified Lukko.FLock as FLock +#endif + +main :: IO () +main = defaultMain $ testGroup "lukko" $ + [ testGroup "Lukko default" $ testSuite fdLock fdUnlock + | fileLockingSupported + ] +#ifdef HAS_OFD_LOCKING + ++ [ testGroup "Lukko.OFD" $ testSuite OFD.fdLock OFD.fdUnlock ] +#endif +#ifdef HAS_FLOCK + ++ [ testGroup "Lukko.FLock" $ testSuite FLock.fdLock FLock.fdUnlock ] +#endif + +testSuite + :: (FD -> LockMode -> IO ()) + -> (FD -> IO ()) + -> [TestTree] +testSuite implLock implUnlock = + [ testCase "concurrent threads" $ do + let n = 10 :: Int + ref <- newIORef 0 + + withSystemTempDirectory "handle-lock-tests" $ \tmpDir -> do + -- print tmpDir + forConcurrently_ [1 :: Int .. n] $ \_ -> + withLock (tmpDir "lock") $ do + val <- readIORef ref + threadDelay 10000 -- 10ms + writeIORef ref (succ val) + + val <- readIORef ref + val @=? n + ] + where + withLock = genWithLock implLock implUnlock + +genWithLock + :: (FD -> LockMode -> IO ()) + -> (FD -> IO ()) + -> FilePath + -> IO a + -> IO a +genWithLock implLock implUnlock fp action = + bracket takeLock releaseLock (const action) + where + takeLock = do + fd <- fdOpen fp + implLock fd ExclusiveLock + return fd + + releaseLock :: FD -> IO () + releaseLock fd = do + implUnlock fd + fdClose fd