Changeset 214

Timestamp:

Oct 7, 2009, 8:33:54 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: DosSearchPath() doesn't like file names with path in pszFilename and seems to always return "not found" in this case.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (2 diffs)

trunk/src/corelib/io/qprocess_os2.cpp ¶

@@ -822 +822 @@
         QStringList knownExts;
         knownExts << "exe" << "cmd" << "bat"; // in order of CMD.EXE's precedence
-        QByteArray path = QFile::encodeName(programInfo.path());
+        QByteArray path =
+            QFile::encodeName(QDir::toNativeSeparators(programInfo.path()));
+        if (path == ".")
+            path.clear();
         // run through all known exe extensions (+ no extension case)
         for (int i = 0; i <= knownExts.size(); ++i) {
@@ -829 +832 @@
                 // no extension case, only if a known extension is already there
                 if (knownExts.contains(programInfo.suffix(), Qt::CaseInsensitive))
-                    name = programName;
+                    name = QFile::encodeName(programInfo.fileName());
                 else
                     continue;
             } else {
-                name = QFile::encodeName(program + QLatin1String(".") + knownExts[i-1]);
+                name = QFile::encodeName(programInfo.fileName() +
+                                         QLatin1String(".") + knownExts[i-1]);
             }
             if (!path.isEmpty()) {