Diff
Not logged in

Differences From:

File src/file.c part of check-in [dbb2cee113] - Fixed Win32 build breakage by mjanssen on 2008-03-11 19:21:57. [view]

To:

File src/file.c part of check-in [becc24e4e9] - On windows builds, understand both "C:/" and "C:\" as the beginning of an absolute pathname. by drh on 2008-05-01 18:42:26. [view]

@@ -205,9 +205,13 @@
 ** Convert /A/../ to just /
 */
 void file_canonical_name(const char *zOrigName, Blob *pOut){
   if( zOrigName[0]=='/'
-      || (strlen(zOrigName)>3 && zOrigName[1]==':' && zOrigName[2]=='\\') ){
+#ifdef __MINGW32__
+      || (strlen(zOrigName)>3 && zOrigName[1]==':'
+           && (zOrigName[2]=='\\' || zOrigName[2]=='/'))
+#endif
+  ){
     blob_set(pOut, zOrigName);
     blob_materialize(pOut);
   }else{
     char zPwd[2000];