diff options
| author | peb <unknown> | 2005-08-08 08:01:10 +0000 |
|---|---|---|
| committer | peb <unknown> | 2005-08-08 08:01:10 +0000 |
| commit | 1351c101337e46a89c066f0830ed6f06fc96cf7a (patch) | |
| tree | c2a07b6182345a72cf8cea2125972630044fdf46 /src/GF/Infra/UseIO.hs | |
| parent | b03a738c4433f40c1eca2691fe09ea31d71475fe (diff) | |
"Committed_by_peb"
Diffstat (limited to 'src/GF/Infra/UseIO.hs')
| -rw-r--r-- | src/GF/Infra/UseIO.hs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs index 67f0d6c1b..7bf9edaf1 100644 --- a/src/GF/Infra/UseIO.hs +++ b/src/GF/Infra/UseIO.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/05/27 11:37:57 $ --- > CVS $Author: aarne $ --- > CVS $Revision: 1.16 $ +-- > CVS $Date: 2005/08/08 09:01:25 $ +-- > CVS $Author: peb $ +-- > CVS $Revision: 1.17 $ -- -- (Description of the module) ----------------------------------------------------------------------------- @@ -147,7 +147,7 @@ prefixPathName p f = case f of c:_ | isSep c -> f -- do not prefix [Unix style] absolute paths _ -> case p of "" -> f - _ -> p ++ "/" ++ f -- / actually works on windows + _ -> p ++ "/" ++ f -- note: / actually works on windows justInitPath :: FilePath -> FilePath justInitPath = reverse . drop 1 . dropWhile (not . isSep) . reverse @@ -303,7 +303,8 @@ readFileIOE f = ioe $ catch (readFile f >>= return . return) -- intended semantics: if file is not found, try @\$GF_LIB_PATH\/file@ -- (even if file is an absolute path, but this should always fail) -- it returns not only contents of the file, but also the path used --- FIXME: unix-specific, / is \ on Windows +-- +-- FIXME: unix-specific, \/ is \\ on Windows readFileLibraryIOE :: String -> FilePath -> IOE (FilePath, String) readFileLibraryIOE ini f = ioe $ catch ((do {s <- readFile initPath; return (return (initPath,s))})) |