Merge 9670f9b into 8ac5c5c

mrkkrp · Mar 5, 2016 · c001564 · c001564
2 parents 8ac5c5c + 9670f9b
commit c001564
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/Codec/Archive/Zip/CP437.hs b/Codec/Archive/Zip/CP437.hs
@@ -15,19 +15,20 @@ where
 
 import Data.ByteString (ByteString)
 import Data.Char
-import Data.Monoid
 import Data.Text (Text)
-import Data.Text.Lazy (toStrict)
 import Data.Word (Word8)
 import qualified Data.ByteString        as B
-import qualified Data.Text.Lazy.Builder as LB
+import qualified Data.Text as T
 
 -- | Decode a 'ByteString' containing CP 437 encoded text.
 
 decodeCP437 :: ByteString -> Text
-decodeCP437 = toStrict . LB.toLazyText . B.foldl' f mempty
-  where f xs b = xs <> LB.singleton (decodeByteCP437 b)
-
+decodeCP437 bs = T.unfoldrN 
+  (B.length bs) 
+  (fmap (\(b,rest) -> (decodeByteCP437 b, rest)) . B.uncons)
+  bs
+
+
 -- | Decode single byte of CP437 encoded text.
 
 decodeByteCP437 :: Word8 -> Char