From 665321a1f148608655648c13958b1cc3e8edabd9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 19 Dec 2013 02:37:21 -0400 Subject: avoid EvilSplicer crashing on encoding problems, including LANG=C with utf-8 in files --- Build/EvilSplicer.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs index 63edc86b9..47402b522 100644 --- a/Build/EvilSplicer.hs +++ b/Build/EvilSplicer.hs @@ -199,10 +199,10 @@ applySplices :: FilePath -> Maybe String -> [Splice] -> IO () applySplices destdir imports splices@(first:_) = do let f = splicedFile first let dest = (destdir f) - lls <- map (++ "\n") . lines <$> readFileStrict f + lls <- map (++ "\n") . lines <$> readFileStrictAnyEncoding f createDirectoryIfMissing True (parentDir dest) let newcontent = concat $ addimports $ expand lls splices - oldcontent <- catchMaybeIO $ readFileStrict dest + oldcontent <- catchMaybeIO $ readFileStrictAnyEncoding dest when (oldcontent /= Just newcontent) $ do putStrLn $ "splicing " ++ f writeFile dest newcontent -- cgit v1.2.3