From: Simon Marlow <simonmar@microsoft.com>
Date: Tue, 22 Jan 2008 16:59:14 +0000 (+0000)
Subject: canonicalizePath should also do System.FilePath.normalise
X-Git-Tag: 2008-05-28~3
X-Git-Url: http://git.megacz.com/?p=haskell-directory.git;a=commitdiff_plain;h=b66b3290e33b761f0c4bc6efebd980df65fca037

canonicalizePath should also do System.FilePath.normalise
The example I've found where this is necessary is on Windows:
canonicalizePath on its own doesn't upper-case the drive letter, but
normalise does.
---

diff --git a/System/Directory.hs b/System/Directory.hs
index 42ed6af..80a20ee 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -584,7 +584,9 @@ canonicalizePath fpath =
 #else
     do c_realpath pInPath pOutPath
 #endif
-       peekCString pOutPath
+       path <- peekCString pOutPath
+       return (normalise path)
+        -- normalise does more stuff, like upper-casing the drive letter
 
 #if defined(mingw32_HOST_OS)
 foreign import stdcall unsafe "GetFullPathNameA"