Changeset 217 for trunk/src/corelib

Timestamp:

Oct 9, 2009, 11:24:19 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Implemented workarounds for starting applications of different types (#72) and for startDetached() (#71).

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -107 +107 @@
 QT_BEGIN_NAMESPACE
 
+
+
 enum
 {
@@ -744 +746 @@
                            const QStringList *environment, bool detached = false)
 {
-    // @todo P_DETACH isn't supported by kLIBC atm, do something else
     int mode = detached ? P_DETACH : P_NOWAIT;
 
-    // Create argument list with right number of elements, and set the final
-    // one to 0.
-    char **argv = new char *[arguments.count() + 2];
+    // Create argument list with right number of elements (one extra is for
+    // the program name and one for the terminating 0). We also reserve 3
+    // elements in front of the array for a posssible command processor call
+    // insertion.
+    char **argvBase = new char *[arguments.count() + 2 + 3];
+
+    // Don't use leading elements by default
+    char **argv = argvBase + 3;
+    // Set the final argument to 0
     argv[arguments.count() + 1] = 0;
 
@@ -902 +909 @@
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         // finally, start the thing
-        pid = spawnve(mode, fullProgramName, argv, envv);
+        pid = spawnve(mode, programReal, argvReal, envv);
+
+#if defined(QPROCESS_DEBUG)
+        qDebug("qt_startProcess: pid %d", pid);
+#endif
 
         if (prependedLibPath) {
@@ -914 +977 @@
     for (int i = 1 /* 0 is programName */; i <= arguments.count(); ++i)
         delete [] argv[i];
-    delete [] argv;
+    delete [] argv;
     if (envv != environ) {
         for (int i = 0; i < envc; ++i)