Simplify utils/pwd

We only need the forwardslash mode now, so always use that mode and
don't accept any arguments.

diff --git a/aclocal.m4 b/aclocal.m4
index 013f7ff..b43d7f5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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])

diff --git a/utils/pwd/pwd.hs b/utils/pwd/pwd.hs
index 45a2d46..6949416 100644 (file)
--- a/utils/pwd/pwd.hs
+++ b/utils/pwd/pwd.hs
@@ -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
 

diff --git a/validate b/validate
index 6229763..94de1cd 100644 (file)
--- a/validate
+++ b/validate
@@ -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