Changeset 187

Timestamp:

Nov 9, 2008, 10:47:20 PM (17 years ago)

Author:

dmik

Message:

Tools: QDir::canonicalPath(): Use realpath()/DosQueryPathInfo() instead of non-threadsafe chdir() approach.

File:

• trunk/src/tools/qdir_pm.cpp (modified) (2 diffs)

trunk/src/tools/qdir_pm.cpp

@@ -52 +52 @@
 #include "qt_os2.h"
 
+#include <stdlib.h>
+
 void QDir::slashify( QString& n )
 {
@@ -92 +94 @@
     QString r;
 
-#if defined(Q_CC_GNU)
-    char drv = 0;
-    if ( dPath[0].isLetter() && dPath[1] == ':' ) {
-        drv = _getdrive();
-        _chdrive( dPath[0].upper().latin1() );
-    }
+    char tmp[PATH_MAX];
+
+#if defined (__INNOTEK_LIBC__)
+    if ( realpath( QFile::encodeName( dPath ), tmp ) != NULL )
+        r = QFile::decodeName( tmp );
 #else
-    int drv = 0;
-    if ( dPath[0].isLetter() && dPath[1] == ':' ) {
-        drv = _getdrive();
-        _chdrive( dPath[0].upper().latin1() - 'A' + 1 );
-    }
+    if ( DosQueryPathInfo( QFile::encodeName( dPath ),
+                           FIL_QUERYFULLNAME, tmp, sizeof(tmp) ) == 0 )
+        r = QFile::decodeName( tmp );
 #endif
-
-    char cur[PATH_MAX];
-    QT_GETCWD( cur, PATH_MAX );
-    if ( QT_CHDIR( QFile::encodeName( dPath ) ) == 0 ) {
-        char tmp[PATH_MAX];
-        if ( QT_GETCWD( tmp, PATH_MAX ) != 0 )
-            r = QFile::decodeName( tmp );
-    }
-    QT_CHDIR( cur );
-
-    if ( drv )
-        _chdrive( drv );
 
     slashify( r );