X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;fp=src%2FMain.hs;h=0ebfafa67aaadcf06e3148b22f0574967b8b7fd8;hb=e42a9a84c3866b7293abb98735c3e76bd12c4dda;hp=174efe28258e608ac48c488ae8225522699b7057;hpb=278b96d51a495b912243efa3a83407d3f830d83f;p=hath.git diff --git a/src/Main.hs b/src/Main.hs index 174efe2..0ebfafa 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -20,8 +20,9 @@ import Cidr ( min_octet2, min_octet3, min_octet4 ) +import qualified Cidr ( normalize ) import CommandLine( - Args( Regexed, Reduced, Duped, Diffed, Listed, barriers ), + Args( Regexed, Reduced, Duped, Diffed, Listed, barriers, normalize ), get_args ) import ExitCodes ( exit_invalid_cidr ) import Octet () @@ -126,8 +127,10 @@ main = do let cidrs' = combine_all valid_cidrs let regexes = map (cidr_to_regex (barriers args)) cidrs' putStrLn $ alternate regexes - Reduced{} -> - mapM_ print (combine_all valid_cidrs) + Reduced{} -> do + -- Pre-normalize all CIDRs if the user asked for it. + let nrml_func = if (normalize args) then Cidr.normalize else id + mapM_ print (combine_all (map nrml_func valid_cidrs)) Duped{} -> mapM_ print dupes where