Commit 9000c679 authored by Ian Lynagh's avatar Ian Lynagh

Simplify utils/pwd

We only need the forwardslash mode now, so always use that mode and
don't accept any arguments.
parent 1e9af42c
......@@ -1255,7 +1255,7 @@ if test ! -f utils/pwd/pwd && test ! -f utils/pwd/pwd.exe; then
cd ../..
fi
hardtop=`utils/pwd/pwd forwardslash`
hardtop=`utils/pwd/pwd`
if ! test -d "$hardtop"; then
AC_MSG_ERROR([cannot determine current directory])
......
......@@ -9,24 +9,14 @@ import System.IO
main :: IO ()
main = do
args <- getArgs
escape <- case args of
["quadruple-backslash"] -> return escape_quadruple_backslash
["forwardslash"] -> return escape_forwardslash
_ -> do hPutStrLn stderr ("Bad args: " ++ show args)
hPutStrLn stderr
"Usage: pwd {forwardslash|quadruple-backslash}"
exitFailure
d <- getCurrentDirectory
putStr $ concatMap escape d
case args of
[] -> do d <- getCurrentDirectory
putStr $ map forwardifySlashes d
_ -> do hPutStrLn stderr ("Bad args: " ++ show args)
hPutStrLn stderr "Usage: pwd"
exitFailure
-- In prog006 we have to escape \ twice, once to get through sed and
-- again to get through parsing pkg.conf
escape_quadruple_backslash :: Char -> String
escape_quadruple_backslash '\\' = "\\\\\\\\"
escape_quadruple_backslash c = [c]
-- Normally we can get away with just replacing backslashes with forwardslashes
escape_forwardslash :: Char -> String
escape_forwardslash '\\' = "/"
escape_forwardslash c = [c]
forwardifySlashes :: Char -> Char
forwardifySlashes '\\' = '/'
forwardifySlashes c = c
......@@ -80,7 +80,7 @@ if [ $no_clean -eq 0 ]; then
./configure --prefix="$INSTDIR" $config_args
fi
thisdir=`utils/pwd/pwd forwardslash`
thisdir=`utils/pwd/pwd`
echo "Validating=YES" > mk/are-validating.mk
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment