From 8425fe4a87c8dbf6f0ca739467d1ce1b0c00411b Mon Sep 17 00:00:00 2001 From: krijo Date: Mon, 24 Jan 2005 15:41:16 +0000 Subject: [PATCH] Handling absolute paths in prefixPathName :: String -> FilePath -> FilePath Handling absolute paths in prefixPathName :: String -> FilePath -> FilePath (absolute paths are simply never prefixed). --- src/GF/Infra/UseIO.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs index d06904297..b37e695bc 100644 --- a/src/GF/Infra/UseIO.hs +++ b/src/GF/Infra/UseIO.hs @@ -94,8 +94,11 @@ pFilePaths s = case span (/=':') s of (f,_) -> [f] prefixPathName :: String -> FilePath -> FilePath -prefixPathName "" f = f -prefixPathName p f = p ++ "/" ++ f +prefixPathName p f = case f of + '/':_ -> f -- do not prefix [Unix style] absolute paths + _ -> case p of + "" -> f + _ -> p ++ "/" ++ f justInitPath :: FilePath -> FilePath justInitPath = reverse . drop 1 . dropWhile (/='/') . reverse