Rethink filename encoding handling for display. Since filename encoding may or may not match locale settings, any attempt to decode filenames will fail for some files. So instead, do all output in binary mode.0.23

3 files changed, 3 insertions, 3 deletions

diff --git a/Command/Find.hs b/Command/Find.hs
index 3e9125b9a..1ca6ff1e7 100644
--- a/Command/Find.hs
+++ b/Command/Find.hs
@@ -25,5 +25,5 @@ seek = [withFilesInGit start]
 start :: CommandStartString
 start file = isAnnexed file $ \(key, _) -> do
 	exists <- inAnnex key
-	when exists $ liftIO $ putStrLn $ filePathToString file
+	when exists $ liftIO $ putStrLn file
 	return Nothing
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index d2f696434..6f9adb79a 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -34,7 +34,7 @@ perform pair@(file, _) = do
 	ok <- doCommand $ Command.Add.start pair
 	if ok
 		then return $ Just $ cleanup file
-		else error $ "failed to add " ++ filePathToString file ++ "; canceling commit"
+		else error $ "failed to add " ++ file ++ "; canceling commit"
 
 cleanup :: FilePath -> CommandCleanup
 cleanup file = do
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 9f3881d59..a614ce5d9 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -68,7 +68,7 @@ checkUnused = do
 		dropmsg = ["(To remove unwanted data: git-annex dropunused NUMBER)"]
 			
 		table l = ["  NUMBER  KEY"] ++ map cols l
-		cols (n,k) = "  " ++ pad 6 (show n) ++ "  " ++ (filePathToString . show) k
+		cols (n,k) = "  " ++ pad 6 (show n) ++ "  " ++ show k
 		pad n s = s ++ replicate (n - length s) ' '
 
 number :: Int -> [a] -> [(Int, a)]