Changeset 7230 for src/Main.hs

Timestamp:

10/03/05 10:59:19 (3 years ago)

Author:

iblech

Message:

* Usual svn props.
* System.FilePath?: Added a not (null fname) guard (i.e., fixed a bug).

We should probably propagate the fix upstream (at least when ok'd by a real
lamda hacker).

* Main: Added %?CONFIG<sourcedir> to the list of paths to search and

added a tryIO call so the search doesn't die.

Files:

• src/Main.hs (modified) (2 diffs)

src/Main.hs

@@ -235 +235 @@
 doExecuteHelper :: [FilePath] -> [String] -> IO ()
 doExecuteHelper helper args = do
-    mbin <- findHelper [["."], ["..", ".."]]
+    let searchPaths = [["."], ["..", ".."], [getConfig "sourcedir"]]
+    mbin <- findHelper searchPaths
     case mbin of
         Just binary -> do
             exitWith =<< executeFile' perl5 True (binary:args) Nothing
-        _ -> fail ("Couldn't find helper program" ++ (foldl1 joinFileName helper))
+        _ -> fail ("Couldn't find helper program " ++ (foldl1 joinFileName helper) ++ " (searched in " ++ show searchPaths ++ ")")
     where
     perl5 = getConfig "perl5path"
@@ -262 +263 @@
     fileExists path = do
         let (p,f) = splitFileName path
-        dir <- getDirectoryContents p
-        return $ f `elem` dir
+        dir <- tryIO Nothing $ fmap Just $ getDirectoryContents p
+        case dir of
+            Just dir' -> return $ f `elem` dir'
+            _         -> return False
 
 doParseWith :: (Env -> FilePath -> IO a) -> FilePath -> String -> IO a