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.

This commit is contained in:
Joey Hess 2011-03-12 15:30:17 -04:00
parent 9229d182d3
commit 72d2684016
12 changed files with 37 additions and 36 deletions

View file

@ -11,7 +11,6 @@ module CmdLine (
shutdown
) where
import System.IO
import System.IO.Error (try)
import System.Console.GetOpt
import Control.Monad.State (liftIO)
@ -31,7 +30,7 @@ import UUID
{- Runs the passed command line. -}
dispatch :: Git.Repo -> [String] -> [Command] -> [Option] -> String -> IO ()
dispatch gitrepo args cmds options header = do
forceUtf8
setupConsole
state <- Annex.new gitrepo allBackends
(actions, state') <- Annex.run state $ parseCmd args header cmds options
tryRun state' $ [startup, upgrade] ++ actions ++ [shutdown]