PATHEXT env var and support for "." on Windows PATH #2225

commercialhaskell · Jun 6, 2016 · d5b8a77 · d5b8a77
1 parent cde532e
commit d5b8a77
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/System/Process/Read.hs b/src/System/Process/Read.hs
@@ -112,11 +112,15 @@ mkEnvOverride platform tm' = do
     return EnvOverride
         { eoTextMap = tm
         , eoStringList = map (T.unpack *** T.unpack) $ Map.toList tm
-        , eoPath = maybe [] (FP.splitSearchPath . T.unpack) (Map.lookup "PATH" tm)
+        , eoPath =
+             (if isWindows then (".":) else id)
+             (maybe [] (FP.splitSearchPath . T.unpack) (Map.lookup "PATH" tm))
         , eoExeCache = ref
         , eoExeExtensions =
             if isWindows
-                then ["", ".exe", ".bat", ".com"]
+                then case Map.lookup "PATHEXT" tm of
+                        Nothing -> ["", ".exe", ".bat", ".com"]
+                        Just t -> map T.unpack $ "" : T.splitOn ";" t
                 else [""]
         , eoPlatform = platform
         }