@@ -118,6 +118,7 @@ import Control.Monad.Reader import Prelude hiding (readFile) import qualified Data.ByteString.Char8 as B import System.FilePath ((</>)) +import Safe -- | Happstack handler for a gitit wiki. wiki :: Config -> ServerPart Response @@ -142,7 +143,7 @@ fileServeStrict' :: [FilePath] -> FilePath -> ServerPart Response fileServeStrict' ps p = do rq <- askRq resp <- fileServeStrict ps p - if rsCode resp == 404 || last (rqUri rq) == '/' + if rsCode resp == 404 || lastNote "fileServeStrict'" (rqUri rq) == '/' then mzero -- pass through if not found or directory index else do -- turn off compresion filter unless it's text Network/Gitit.hs @@ -24,6 +24,7 @@ module Network.Gitit.Config ( getConfigFromOpts , readMimeTypesFile , getDefaultConfig ) where +import Safe import Network.Gitit.Types import Network.Gitit.Server (mimeTypes) import Network.Gitit.Framework @@ -235,7 +236,7 @@ fromQuotedMultiline = unlines . map doline . lines . dropWhile (`elem` " \t\n") readNumber :: (Read a) => String -> String -> a readNumber opt "" = error $ opt ++ " must be a number." readNumber opt x = - let x' = case last x of + let x' = case lastNote "readNumber" x of 'K' -> init x ++ "000" 'M' -> init x ++ "000000" 'G' -> init x ++ "000000000" Network/Gitit/Config.hs @@ -56,6 +56,7 @@ module Network.Gitit.Framework ( , filestoreFromConfig ) where +import Safe import Network.Gitit.Server import Network.Gitit.State import Network.Gitit.Types @@ -313,7 +314,7 @@ guardIndex = do base <- getWikiBase uri' <- liftM rqUri askRq let localpath = drop (length base) uri' - if length localpath > 1 && last uri' == '/' + if length localpath > 1 && lastNote "guardIndex" uri' == '/' then return () else mzero Network/Gitit/Framework.hs @@ -53,6 +53,7 @@ module Network.Gitit.Handlers ( , feedHandler ) where +import Safe import Data.FileStore import Network.Gitit.Server import Network.Gitit.Framework @@ -666,7 +667,7 @@ fileListToHtml base' prefix files = href $ if length d == 1 then base' ++ "/_index" else base' ++ joinPath d] << - last d, accum]) noHtml updirs + lastNote "fileListToHtml" d, accum]) noHtml updirs in uplink +++ ulist ! [theclass "index"] << map fileLink files -- NOTE: The current implementation of categoryPage does not go via the Network/Gitit/Handlers.hs @@ -98,7 +98,7 @@ Library exposed-modules: Network.Gitit.Interface build-depends: ghc, ghc-paths cpp-options: -D_PLUGINS - build-depends: base >= 3, pandoc >= 1.1, filepath + build-depends: base >= 3, pandoc >= 1.1, filepath, safe ghc-options: -Wall ghc-prof-options: -auto-all -caf-all gitit.cabal 965336a5284c23caca7ac5f9625ecaee9f1b3546 Thomas Hartman thomas@modernfeed.com http://github.com/jgm/gitit/commit/85d15a6d1ee00c63ca1cf0b7337e8ab21a7aef26 85d15a6d1ee00c63ca1cf0b7337e8ab21a7aef26 2009-10-24T09:19:04-07:00 2009-10-24T09:19:04-07:00 safify, replace unsafe last last with lastNote, which at least gives a meaningful error message f53985724644d79aba8c15d68233e93d50b9aa80 Thomas Hartman thomas@modernfeed.com