Fixed a bug in handling windoze driver letter ":" notation.

diff --git a/Lib/Misc/fgpath.cxx b/Lib/Misc/fgpath.cxx
index a49c025ffa6e3ab0a61be989bc7369af78d843cf..d31b44c60db8f9e56a6281e8801fec95985ed054 100644 (file)
--- a/Lib/Misc/fgpath.cxx
+++ b/Lib/Misc/fgpath.cxx
@@ -28,12 +28,19 @@
 
 // If Unix, replace all ":" with "/".  If MacOS, replace all "/" with
 // ":" it should go without saying that neither of these characters
-// should be used in file or directory names.
+// should be used in file or directory names.  In windoze, allow the
+// second character to be a ":" for things like c:\foo\bar
 
 static string fix_path( const string path ) {
     string result = path;
 
     for ( int i = 0; i < (int)path.size(); ++i ) {
+#if defined( WIN32 )
+       // for windoze, don't replace the ":" for the second character
+       if ( i == 1 ) {
+           continue;
+       }
+#endif
        if ( result[i] == FG_BAD_PATH_SEP ) {
            result[i] = FG_PATH_SEP;
        }

diff --git a/Lib/Misc/fgpath.hxx b/Lib/Misc/fgpath.hxx
index a3d3fc71ea4eb7484ea28d21725905339c73770c..30ba3b7cd07828c942922110729e35f69a9a25ee 100644 (file)
--- a/Lib/Misc/fgpath.hxx
+++ b/Lib/Misc/fgpath.hxx
@@ -27,6 +27,10 @@
 #define _FGPATH_HXX
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <Include/compiler.h>
 
 #include STL_STRING