From 68e9edadb6437a68888cf642f0d3303c6682fc46 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 2 Jun 2016 03:21:15 +0200
Subject: ignore empty lines

---
 ymir/mlmmj-expose.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ymir/mlmmj-expose.nix b/ymir/mlmmj-expose.nix
index df1374ae..15d846dc 100644
--- a/ymir/mlmmj-expose.nix
+++ b/ymir/mlmmj-expose.nix
@@ -40,7 +40,7 @@ let
                 setCurrentDirectory listDir
                 key <- (BS.readFile "exposed.key") `catchIOError` (\e -> if isDoesNotExistError e then randomKey >>= (\k -> BS.writeFile "exposed.key" k >> return k) else ioError e)
                 let ((map toLower -> ident), (map toLower -> recipient)) = read . CLBS.unpack $ decryptMsg CBC key extension
-                identities <- (lines <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e)
+                identities <- getIdentities
                 unless (ident `elem` identities) . die $ "Unknown sender: ‘" ++ ident ++ "’"
                 subscribers <- getSubscribers
                 unless (recipient `elem` subscribers) . die $ "Unknown recipient: ‘" ++ recipient ++ "’"
@@ -63,7 +63,7 @@ let
               (dropTrailingPathSeparator -> listDir) : (map toLower -> ident) : (map (map toLower) -> recipients) -> do
                 setCurrentDirectory listDir
                 key <- (BS.readFile "exposed.key") `catchIOError` (\e -> if isDoesNotExistError e then randomKey >>= (\k -> BS.writeFile "exposed.key" k >> return k) else ioError e)
-                identities <- (lines <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e)
+                identities <- getIdentities
                 unless (ident `elem` identities) . die $ "Unknown sender: ‘" ++ ident ++ "’"
                 subscribers <- getSubscribers
                 forM_ recipients (\recipient -> do {
@@ -72,6 +72,8 @@ let
                 })
               _ -> hPutStrLn stderr ("Called without expected arguments (<listDirectory> <senderIdentity> [<recipient> [...]])") >> exitWith (ExitFailure 2)
           _ -> hPutStrLn stderr ("Called under unsupported name ‘" ++ progName ++ "’") >> exitWith (ExitFailure 2)
+      getIdentities :: IO [String]
+      getIdentities = (filter (not . null) . lines <$> readFile "exposed.ids") `catchIOError` (\e -> if isDoesNotExistError e then return [] else ioError e)
 
       getSubscribers :: IO [String]
       getSubscribers = map (map toLower) . concat <$> mapM (flip catchIOError (\e -> if isDoesNotExistError e then return [] else ioError e) . readDir) ["subscribers.d", "digesters.d"]
-- 
cgit v1.2.3