fromkey, registerurl: When reading from stdin, allow the filename and url, respectively, to contain whitespace.

2 files changed, 4 insertions, 4 deletions

diff --git a/Command/FromKey.hs b/Command/FromKey.hs
index 10484b840..ebc0e6f6e 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -41,10 +41,10 @@ start _ [] = do
 start _ _ = error "specify a key and a dest file"
 
 massAdd :: CommandPerform
-massAdd = go True =<< map words . lines <$> liftIO getContents
+massAdd = go True =<< map (separate (== ' ')) . lines <$> liftIO getContents
   where
 	go status [] = next $ return status
-	go status ([keyname,f]:rest) = do
+	go status ((keyname,f):rest) | not (null keyname) && not (null f) = do
 		let key = fromMaybe (error $ "bad key " ++ keyname) $ file2key keyname
 		ok <- perform' key f
 		let !status' = status && ok
diff --git a/Command/RegisterUrl.hs b/Command/RegisterUrl.hs
index 3ff1becc9..d0e806597 100644
--- a/Command/RegisterUrl.hs
+++ b/Command/RegisterUrl.hs
@@ -34,10 +34,10 @@ start [] = do
 start _ = error "specify a key and an url"
 
 massAdd :: CommandPerform
-massAdd = go True =<< map words . lines <$> liftIO getContents
+massAdd = go True =<< map (separate (== ' ')) . lines <$> liftIO getContents
   where
 	go status [] = next $ return status
-	go status ([keyname,u]:rest) = do
+	go status ((keyname,u):rest) | not (null keyname) && not (null u) = do
 		let key = fromMaybe (error $ "bad key " ++ keyname) $ file2key keyname
 		ok <- perform' key u
 		let !status' = status && ok