From 9b746ee5882aaa4cd4feaf52edf0f574a66a990b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 5 Oct 2013 13:32:42 -0400
Subject: [PATCH] honor fileNameLengthLimit for quvi

---
 Command/AddUrl.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index 2379857dc6..b90297f27b 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -83,7 +83,8 @@ start relaxed optfile pathdepth s = go $ fromMaybe bad $ parseURI s
 		page <- fromMaybe badquvi
 			<$> withQuviOptions Quvi.forceQuery [Quvi.quiet, Quvi.httponly] s'
 		let link = fromMaybe badquvi $ headMaybe $ Quvi.pageLinks page
-		let file = choosefile $ sanitizeFilePath $
+		pathmax <- liftIO $ fileNameLengthLimit "."
+		let file = choosefile $ truncateFilePath pathmax $ sanitizeFilePath $
 			Quvi.pageTitle page ++ "." ++ Quvi.linkSuffix link
 		showStart "addurl" file
 		next $ performQuvi relaxed s' (Quvi.linkUrl link) file
@@ -214,7 +215,7 @@ nodownload relaxed url file = do
 
 url2file :: URI -> Maybe Int -> Int -> FilePath
 url2file url pathdepth pathmax = case pathdepth of
-	Nothing -> truncateFilePath pathmax $ escape fullurl
+	Nothing -> truncateFilePath pathmax $ sanitizeFilePath fullurl
 	Just depth
 		| depth >= length urlbits -> frombits id
 		| depth > 0 -> frombits $ drop depth