From 2d956677eff4ce5635e37f389f1d2efd6f34615c Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Fri, 8 Aug 2014 20:10:58 +0100
Subject: Shared: Added collapseFilePath function

This function removes intermediate "." and ".." from a path.
---
 src/Text/Pandoc/Shared.hs | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 51da34e79..a91ca9115 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -80,6 +80,7 @@ module Text.Pandoc.Shared (
                      fetchItem,
                      fetchItem',
                      openURL,
+                     collapseFilePath,
                      -- * Error handling
                      err,
                      warn,
@@ -105,6 +106,7 @@ import Network.URI ( escapeURIString, isURI, nonStrictRelativeTo,
                      unEscapeString, parseURIReference, isAllowedInURI )
 import qualified Data.Set as Set
 import System.Directory
+import System.FilePath (joinPath, splitDirectories)
 import Text.Pandoc.MIME (getMimeType)
 import System.FilePath ( (</>), takeExtension, dropExtension)
 import Data.Generics (Typeable, Data)
@@ -530,7 +532,7 @@ stringify = query go . walk deNote
         deNote x = x
 
 -- | Bring all regular text in a pandoc structure to uppercase.
--- 
+--
 -- This function correctly handles cases where a lowercase character doesn't
 -- match to a single uppercase character – e.g. “Straße” would be converted
 -- to “STRASSE”, not “STRAßE”.
@@ -854,6 +856,29 @@ warn msg = do
   name <- getProgName
   UTF8.hPutStrLn stderr $ name ++ ": " ++ msg
 
+-- | Remove intermediate "." and ".." directories from a path.
+--
+-- @
+--  collapseFilePath "./foo" == "foo"
+--  collapseFilePath "/bar/../baz" == "/baz"
+--  collapseFilePath "/../baz" == "/../baz"
+--  collapseFilePath "parent/foo/baz/../bar" ==  "parent/foo/bar"
+--  collapseFilePath "parent/foo/baz/../../bar" ==  "parent/bar"
+--  collapseFilePath "parent/foo/.." ==  "parent"
+--  collapseFilePath "/parent/foo/../../bar" ==  "/bar"
+--  @
+collapseFilePath :: FilePath -> FilePath
+collapseFilePath = joinPath . reverse . foldl go [] . splitDirectories
+  where
+    go rs "." = rs
+    go r@(p:rs) ".." = case p of
+                            ".." -> ("..":r)
+                            "/" -> ("..":r)
+                            _ -> rs
+    go _ "/" = ["/"]
+    go rs x = x:rs
+
+
 --
 -- Safe read
 --
-- 
cgit v1.2.3