Changeset 177 for trunk/src

Timestamp:

Sep 11, 2009, 2:27:35 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed: QDir::currentPath() would return the file path without the drive letter.

File:

• trunk/src/corelib/io/qfsfileengine_os2.cpp (modified) (1 diff)

trunk/src/corelib/io/qfsfileengine_os2.cpp

@@ -462 +462 @@
 }
 
-QString QFSFileEngine::currentPath(const QString &)
-{
-    QString result;
-    QT_STATBUF st;
-    if (QT_STAT(".", &st) == 0) {
-#if defined(__GLIBC__) && !defined(PATH_MAX)
-        char *currentName = ::get_current_dir_name();
-        if (currentName) {
-            result = QFile::decodeName(QByteArray(currentName));
-            ::free(currentName);
-        }
-#else
-        char currentName[PATH_MAX+1];
-        if (::getcwd(currentName, PATH_MAX))
-            result = QFile::decodeName(QByteArray(currentName));
+/*!
+    Returns the canonicalized form of the current path used by the file
+    engine for the drive specified by \a fileName.
+
+    On OS/2, each drive has its own current directory, so a different
+    path is returned for file names that include different drive names
+    (e.g. A: or C:).
+
+    \sa setCurrentPath()
+*/
+QString QFSFileEngine::currentPath(const QString &fileName)
+{
+    // if filename starts with X: then get the pwd of that drive; otherwise the
+    // pwd of the current drive
+    char drv = _getdrive();
+    if (fileName.length() >= 2 &&
+        fileName.at(0).isLetter() && fileName.at(1) == QLatin1Char(':')) {
+        drv = fileName.at(0).toUpper().toLatin1();
+    }
+    char buf[PATH_MAX + 1 + 2 /* X: */];
+    buf[0] = drv;
+    buf[1] = ':';
+    QString ret;
+    if (!_getcwd1(buf + 2, drv)) {
+        ret = QFile::decodeName(QByteArray(buf));
+        ret = QDir::fromNativeSeparators(ret);
+    }
+#if defined(QT_DEBUG)
+    if (ret.isEmpty())
+        qWarning("QDir::currentPath: _getcwd1(%s, %d) failed (%d)",
+                 fileName.toUtf8().constData(), drv, errno);
 #endif
-#if defined(QT_DEBUG)
-        if (result.isNull())
-            qWarning("QDir::currentPath: getcwd() failed");
-#endif
-    } else {
-#if defined(QT_DEBUG)
-        qWarning("QDir::currentPath: stat(\".\") failed");
-#endif
-    }
-    return result;
+    return ret;
 }