From 671816fbe567ce4006ff65efb60e6b2422aac50d Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 27 Jun 2018 11:54:32 +0200 Subject: [PATCH] allow multiple -F --- Network/AMQP/Utils/Options.hs | 6 +++--- agitprop.hs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Network/AMQP/Utils/Options.hs b/Network/AMQP/Utils/Options.hs index 1544e67..6458483 100644 --- 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 03f0e4a..b787a51 100644 --- 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 -- 2.39.5