hath.cabal: drop a word and a period from the synopsis

[hath.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 26d54d143ab9cd82672198e358b2ec4501860fb5..085e30e1ba62aef6c53364e5b6dae8a67994124f 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,10 +1,10 @@
-module Main
+module Main (main)
 where
 
 import Control.Monad (when)
 import Data.List ((\\), intercalate)
+import qualified Data.List as List (sort)
 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 +21,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, sort ),
+  get_args )
 import ExitCodes ( exit_invalid_cidr )
 import Octet ()
 
@@ -101,7 +104,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 +128,11 @@ 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
+      let sort_func = if (sort args) then List.sort else id :: [Cidr] -> [Cidr]
+      mapM_ (print . nrml_func) (sort_func $ combine_all valid_cidrs)
     Duped{} ->
        mapM_ print dupes
        where