omnicodec 0.1 → 0.2

raw patch · 3 files changed

+7/−5 lines, 3 filesdep ~dataenc

Dependency ranges changed: dataenc

Files

• omnicodec.cabal +3/−3
• src/odec.hs +2/−1
• src/oenc.hs +2/−1

@@ -1,13 +1,13 @@ name: omnicodec-version: 0.1+version: 0.2 license: GPL license-file: COPYING author: Magnus Therning maintainer: magnus@therning.org copyright: Magnus Therning, 2007 synopsis: data encoding and decoding command line utilities-description: Two simply utilities built on dataenc-build-depends: base, dataenc >= 0.10.1, directory, filepath, haskell98+description: Two simply command line tools built on dataenc.+build-depends: base, dataenc >= 0.11, directory, filepath, haskell98 build-type: Simple category: Codec 

@@ -50,7 +50,7 @@ options :: [OptDescr (DecOptions -> IO DecOptions)] options = [     Option "o" ["output"] (ReqArg setOptOutput "FILE") "output to file",-    Option "c" ["codec"] (ReqArg setOptCodec "CODEC") "use codec (uu,b64,b64u,b32,b32h,b16)",+    Option "c" ["codec"] (ReqArg setOptCodec "CODEC") "use codec (uu,b85,b64,b64u,b32,b32h,b16)",     Option "" ["version"] (NoArg optShowVersion) "",     Option "h" ["help"] (NoArg optShowHelp) ""     ]@@ -59,6 +59,7 @@ setOptOutput fn opts = return opts { optWrite = writeFile fn, fn = Just fn } setOptCodec codec opts = case codec of     "uu" -> return opts { optDecode = decode' uu . unchop uu }+    "b85" -> return opts { optDecode = decode' base85 . unchop base85 }     "b64" -> return opts { optDecode = decode' base64 . unchop base64 }     "b64u" -> return opts { optDecode = decode' base64Url . unchop base64Url }     "b32" -> return opts { optDecode = decode' base32 . unchop base32 }

@@ -47,7 +47,7 @@ options :: [OptDescr (EncOptions -> IO EncOptions)] options = [     Option "o" ["output"] (ReqArg setOptOutput "FILE") "output to file",-    Option "c" ["codec"] (ReqArg setOptCodec "CODEC") "use codec (uu,b64,b64u,b32,b32h,b16)",+    Option "c" ["codec"] (ReqArg setOptCodec "CODEC") "use codec (uu,b85,b64,b64u,b32,b32h,b16)",     Option "" ["version"] (NoArg optShowVersion) "",     Option "h" ["help"] (NoArg optShowHelp) ""     ]@@ -55,6 +55,7 @@ -- {{{2 option actions setOptCodec codec opts = case codec of     "uu" -> return opts { optEncode = chop uu 61 . encode uu }+    "b85" -> return opts { optEncode = chop base85 60 . encode base85 }     "b64" -> return opts { optEncode = chop base64 60 . encode base64 }     "b64u" -> return opts { optEncode = chop base64Url 60 . encode base64Url }     "b32" -> return opts { optEncode = chop base32 60 . encode base32 }