X-Git-Url: http://gitweb.michael.orlitzky.com/?p=haeredes.git;a=blobdiff_plain;f=src%2FMain.hs;h=8178209b5dac41ee3692aa545c39f2c63e5d3e4e;hp=3e8d8c09c92021dcd05210a336e46703eb9a552f;hb=a27c37544ae78ca3940987dfd7119e384422ff3b;hpb=80ae5c930e028d0fd5ec1afb76cf10327ab6bd0e

diff --git a/src/Main.hs b/src/Main.hs
index 3e8d8c0..8178209 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -9,8 +9,7 @@ import qualified Data.ByteString.Char8 as BS (
   getContents,
   pack,
   words )
-import Data.List ( (\\) )
-import Data.String.Utils (join)
+import Data.List ( (\\), intersperse )
 import Network.DNS (
   Domain,
   FileOrNumericHost(RCHostName),
@@ -20,18 +19,19 @@ import Network.DNS (
   normalize,
   normalizeCase,
   withResolver )
-import System.Exit (ExitCode(..), exitWith)
+import System.Exit (ExitCode(ExitFailure), exitWith)
 import System.IO (hPutStrLn, stderr)
 
-
-import CommandLine (Args(..), get_args)
+import CommandLine (
+   Args(NS,MX,delegates,no_append_root,server,timeout),
+   get_args)
 import DNS (
   LookupResult,
   lookupMX',
   lookupNS',
   resolve_address )
 import ExitCodes (exit_bad_server)
-import Timeout (Timeout(..))
+import Timeout (Timeout(seconds))
 
 
 -- | Given a list of delegates, report results for this
@@ -71,6 +71,11 @@ report delgts normalize_function (d, Right raw_hosts) = do
                (show d) ++
                " delegates somewhere else: " ++
                (join " " (map show leftovers))
+  where
+    -- Create one big string by joining together a list of smaller
+    -- strings and placing a delimiter between them.
+    join :: String -> [String] -> String
+    join delimiter strings = concat (intersperse delimiter strings)
 
 
 main :: IO ()
@@ -113,7 +118,7 @@ main = do
 
   -- Set the timeout from the command line. The resolvTimeout field is
   -- in microseconds, so we multiply by one million.
-  let a_million = 1000 * 1000
+  let a_million = 1000 * 1000 :: Int
   let rc = rc' { resolvTimeout = a_million * seconds (timeout cfg) }
   rs <- makeResolvSeed rc