cabal: bump data-default dependency to 0.5.0.

[hs-java.git] / Java / JAR.hs

diff --git a/Java/JAR.hs b/Java/JAR.hs
index 1c92f50e2390a57ebe3c0504c0a396a54969d33a..a5614da0e5cfa8c94192a30bf9a8ebd4ce409e4c 100644 (file)
--- a/Java/JAR.hs
+++ b/Java/JAR.hs
@@ -2,6 +2,7 @@
 module Java.JAR 
   (readManifest,
    readJAR,
+   readMainClass,
    addJAR
   ) where
 
@@ -31,7 +32,16 @@ readOne jarfile str = do
     files <- Zip.fileNames []
     return $ mapF (NotLoadedJAR jarfile) (buildTree $ filter good files)
   where
-    good name = str `isPrefixOf` name
+    good name = (str `isPrefixOf` name) && (".class" `isSuffixOf` name)
+
+-- | Read MainClass Entry of a MANIFEST.MF file
+readMainClass :: FilePath -> IO (Maybe String)
+readMainClass jarfile = do
+  Zip.withArchive [] jarfile $ do
+    m <- readManifest
+    case m of
+      Nothing -> return Nothing
+      Just mf -> return $ mainClass mf
 
 -- | Read entries from JAR file, using MANIFEST.MF if it exists.
 readJAR :: FilePath -> IO [Tree CPEntry]
@@ -46,6 +56,7 @@ readJAR jarfile = do
                       return (Just forest)
   case r of
     Nothing -> readAllJAR jarfile
+    Just [] -> readAllJAR jarfile
     Just f  -> return f
 
 -- | Add given JAR file to ClassPath