[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit a52cdd92390e370e7ff6aed94a9dac270bca4a2c
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sat Dec 4 05:22:27 2004 +0100

    Started to use real header
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-22)

diff --git a/ChangeLog b/ChangeLog
index 1d11a85..ab40ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-03 22:22:27 GMT	John Goerzen <jgoerzen at complete.org>	patch-22
+
+    Summary:
+      Started to use real header
+    Revision:
+      missingh--head--0.7--patch-22
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/FileArchive/GZip.hs
+
+
 2004-12-03 22:15:14 GMT	John Goerzen <jgoerzen at complete.org>	patch-21
 
     Summary:
diff --git a/libsrc/MissingH/FileArchive/GZip.hs b/libsrc/MissingH/FileArchive/GZip.hs
index bd49def..adb88d4 100644
--- a/libsrc/MissingH/FileArchive/GZip.hs
+++ b/libsrc/MissingH/FileArchive/GZip.hs
@@ -42,6 +42,14 @@ fFEXTRA = 4::Int
 fFNAME = 8::Int
 fFCOMMENT = 16::Int
 
+data Header = Header {
+                      method :: Int,
+                      flags :: Int,
+                      extra :: Maybe String,
+                      filename :: Maybe String,
+                      comment :: Maybe String
+                     }
+
 split1 :: String -> (Char, String)
 split1 s = (head s, tail s)
 
@@ -56,7 +64,7 @@ decompress s =
 
 {- | Read the GZip header.  Return (Header, Remainder).
 -}
-read_header :: String -> Either GZipError (String, String)
+read_header :: String -> Either GZipError (Header, String)
 read_header s =
     let ok = Right "ok" in
     do let (mag, rem) = splitAt 2 s
@@ -95,4 +103,8 @@ read_header s =
                   then return $ drop 2 rem7
                   else return rem7
                   
-       return ("foo", rem8)
+       return (Header {method = ord method,
+                      flags = flag,
+                      extra = Nothing,
+                      filename = Nothing,
+                      comment = Nothing}, rem8)

-- 
haskell-testpack