Changeset 215 for trunk/src

Timestamp:

Oct 7, 2009, 9:22:41 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Implicitly prepend the path to the executable to BEGINLIBPATH to make sure DLLs are searched there first (#84).

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -870 +870 @@
         errno = ENOENT;
     } else {
+        // add the program's dir to BEGINLIBPATH to make sure the DLLs are
+        // serached there first (no, the OS/2 loader does't do it itself)
+        QFileInfo fullProgramInfo(QFile::decodeName(fullProgramName));
+        QString fullPath = QDir::toNativeSeparators(fullProgramInfo.absolutePath());
+
+        APIRET arc;
+        QStringList paths;
+        char libPathBuf[4096]; // @todo isn't it too small?
+        bool prependedLibPath = false;
+
+        DosQueryExtLIBPATH(libPathBuf, BEGIN_LIBPATH);
+        Q_ASSERT(arc == NO_ERROR);
+        if (arc == NO_ERROR) {
+            QString path = QFile::decodeName(libPathBuf);
+            paths = path.split(';', QString::SkipEmptyParts);
+            if (paths.contains(fullPath, Qt::CaseInsensitive)) {
+#if defined(QPROCESS_DEBUG)
+                qDebug("qt_startProcess: \"%s\" is already in BEGINLIBPATH",
+                       qPrintable(fullPath));
+#endif
+            } else {
+#if defined(QPROCESS_DEBUG)
+                qDebug("qt_startProcess: prepending \"%s\" to BEGINLIBPATH",
+                       qPrintable(fullPath));
+#endif
+                prependedLibPath = true;
+                QByteArray newLibPath = libPathBuf;
+                newLibPath.prepend(';').prepend(QFile::encodeName(fullPath));
+                DosSetExtLIBPATH(newLibPath, BEGIN_LIBPATH);
+            }
+        }
+
+        // finally, start the thing
         pid = spawnvpe(mode, fullProgramName, argv, envv);
+
+        if (prependedLibPath) {
+            // restore BEGINLIBPATH
+            DosSetExtLIBPATH(libPathBuf, BEGIN_LIBPATH);
+        }
     }