allow multiple -F

diff --git a/Network/AMQP/Utils/Options.hs b/Network/AMQP/Utils/Options.hs
index 1544e677b9323b93c225cef901a403e623b0239a..6458483701e2fa0da1a9fbe5a062c7396da53752 100644 (file)
--- a/Network/AMQP/Utils/Options.hs
+++ b/Network/AMQP/Utils/Options.hs
@@ -47,7 +47,7 @@ data Args = Args
   , msgcorrid :: Maybe Text
   , msgexp :: Maybe Text
   , msgheader :: Maybe FieldTable
-  , fnheader :: Maybe String
+  , fnheader :: [ String ]
   }
 
 instance Default Args where
@@ -89,7 +89,7 @@ instance Default Args where
       Nothing
       Nothing
       Nothing
-      Nothing
+      []
 
 -- | Common options
 cOptions :: [OptDescr (Args -> Args)]
@@ -298,7 +298,7 @@ aOptions =
   , Option
       ['F']
       ["fnheader"]
-      (ReqArg (\s o -> o {fnheader = Just s}) "HEADERNAME")
+      (ReqArg (\s o -> o {fnheader = s:(fnheader o)}) "HEADERNAME")
       ("Message Header for filename")
   ]
 

diff --git a/agitprop.hs b/agitprop.hs
index 03f0e4a8b7daabc0d930d33a50c4abe391cc2fb6..b787a51d64dfc7dac9e44b73ef7921fc6fba3612 100644 (file)
--- a/agitprop.hs
+++ b/agitprop.hs
@@ -124,6 +124,6 @@ publishOneMsg' c a fn f = do
   printparam "sent" $ fmap show r
   where
     substheader ::
-         Maybe String -> Maybe String -> Maybe FieldTable -> Maybe FieldTable
-    substheader (Just fnh) (Just fname) old = addheader old (fnh ++ "=" ++ fname)
+         [String] -> Maybe String -> Maybe FieldTable -> Maybe FieldTable
+    substheader (s:r) (Just fname) old = substheader r (Just fname) (addheader old (s ++ "=" ++ fname))
     substheader _ _ old = old