Changeset 213 for trunk/src

Timestamp:

Oct 7, 2009, 7:12:31 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Search for executable ourselves before passing it to spawnvpe(). This in particular ensures that the current working directory is always searched first before anything in PATH (to match the expected and also CMD.EXE behavior).

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -753 +753 @@
 
     // Encode the program name.
-    QByteArray encodedProgramName = QFile::encodeName(program);
+    QByteArray rogramName = QFile::encodeName(program);
 
     // Add the program name to the argument list.
-    argv[0] = encodedProgramName.data();
+    argv[0] = rogramName.data();
 
     // Add every argument to the list
@@ -807 +807 @@
     }
 
-    // start the program
-#ifdef QPROCESS_DEBUG
-    qDebug("Trying spawnvpe(%d, \"%s\")",
-           mode, encodedProgramName.constData());
-#endif
-    int pid = spawnvpe(mode, encodedProgramName, argv, envv);
-
-    // if spawnvpe() couldn't find the executable, try .CMD and .BAT
-    // extensions (in order of CMD.EXE precedence); spawnvpe() knows how to
-    // locate and run them (i.e. using CMD.EXE /c)
-    if (pid == -1 && errno == ENOENT) {
-        encodedProgramName += ".cmd";
-        argv[0] = encodedProgramName.data();
-#ifdef QPROCESS_DEBUG
-            qDebug("Trying spawnvpe(%d, \"%s\")",
-                   mode, encodedProgramName.constData());
-#endif
-        pid = spawnvpe(mode, encodedProgramName, argv, envv);
-        if ( pid == -1 && errno == ENOENT ) {
-            qstrcpy(encodedProgramName.data() + encodedProgramName.length() - 4, ".bat");
-            argv[0] = encodedProgramName.data();
-#ifdef QPROCESS_DEBUG
-            qDebug("Trying spawnvpe(%d, \"%s\")",
-                   mode, encodedProgramName.constData());
-#endif
-            pid = spawnvpe(mode, encodedProgramName, argv, envv);
-        }
+#if defined(QPROCESS_DEBUG)
+    qDebug("qt_startProcess: workdir is \"%s\"", qPrintable(QDir::currentPath()));
+#endif
+
+    // try to find the executable
+    QByteArray fullProgramName;
+
+    // don't go further if we got an empty program name: a file with such a name
+    // cannot exist on OS/2 and many QFileInfo funcs are undefined for this case
+    if (!programName.isEmpty()) {
+        APIRET arc;
+        char pathBuf[CCHMAXPATH];
+        QFileInfo programInfo(program);
+        QStringList knownExts;
+        knownExts << "exe" << "cmd" << "bat"; // in order of CMD.EXE's precedence
+        QByteArray path = QFile::encodeName(programInfo.path());
+        // run through all known exe extensions (+ no extension case)
+        for (int i = 0; i <= knownExts.size(); ++i) {
+            QByteArray name;
+            if (i == 0) {
+                // no extension case, only if a known extension is already there
+                if (knownExts.contains(programInfo.suffix(), Qt::CaseInsensitive))
+                    name = programName;
+                else
+                    continue;
+            } else {
+                name = QFile::encodeName(program + QLatin1String(".") + knownExts[i-1]);
+            }
+            if (!path.isEmpty()) {
+                arc = DosSearchPath(0, path, name, pathBuf, sizeof(pathBuf));
+            } else {
+                arc = DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
+                                    SEARCH_CUR_DIRECTORY, "PATH",
+                                    name, pathBuf, sizeof(pathBuf));
+            }
+
+            if (arc == NO_ERROR) {
+                fullProgramName = pathBuf;
+                break;
+            }
+            if (arc != ERROR_FILE_NOT_FOUND && arc != ERROR_PATH_NOT_FOUND) {
+                qWarning("qt_startProcess: DosSearchPath(%s) returned %lu",
+                         qPrintable(QFile::decodeName(name)), arc);
+                break;
+            }
+        }
+    }
+
+#if defined(QPROCESS_DEBUG)
+    qDebug("qt_startProcess: found \"%s\" for \"%s\"",
+           qPrintable(QFile::decodeName(fullProgramName)),
+           qPrintable(QFile::decodeName(programName)));
+#endif
+
+    int pid = -1;
+    if (fullProgramName.isEmpty()) {
+        // return "No such file or directory"
+        errno = ENOENT;
+    } else {
+        pid = spawnvpe(mode, fullProgramName, argv, envv);
     }
 
     // Clean up duplicated memory.
-    for (int i = 1 /* 0 is encodedProgramName */; i <= arguments.count(); ++i)
+    for (int i = 1 /* 0 is rogramName */; i <= arguments.count(); ++i)
         delete [] argv[i];
     delete [] argv;
@@ -857 +890 @@
 
 #if defined (QPROCESS_DEBUG)
-    qDebug("QProcessPrivate::startProcess()");
+    qDebug("QProcessPrivate::startProcess");
 #endif