X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=0ebfafa67aaadcf06e3148b22f0574967b8b7fd8;hb=a8c2d85d8611f7f56eaa0c3406ec423d68f81f96;hp=26d54d143ab9cd82672198e358b2ec4501860fb5;hpb=9dcb70651417b7e91ccea3186b409befac2e6f71;p=hath.git

diff --git a/src/Main.hs b/src/Main.hs
index 26d54d1..0ebfafa 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -4,7 +4,6 @@ where
 import Control.Monad (when)
 import Data.List ((\\), intercalate)
 import Data.Maybe (catMaybes, isNothing)
-import Data.String.Utils (splitWs)
 import System.Exit (ExitCode( ExitFailure ), exitWith)
 import System.IO (stderr, hPutStrLn)
 import Text.Read (readMaybe)
@@ -21,7 +20,10 @@ import Cidr (
   min_octet2,
   min_octet3,
   min_octet4 )
-import CommandLine (Args(..), get_args)
+import qualified Cidr ( normalize )
+import CommandLine(
+  Args( Regexed, Reduced, Duped, Diffed, Listed, barriers, normalize ),
+  get_args )
 import ExitCodes ( exit_invalid_cidr )
 import Octet ()
 
@@ -101,7 +103,7 @@ main = do
   -- This reads stdin.
   input <- getContents
 
-  let cidr_strings = splitWs input
+  let cidr_strings = words input
   let cidrs = map readMaybe cidr_strings :: [Maybe Cidr]
 
   when (any isNothing cidrs) $ do
@@ -125,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