Changeset 484 for trunk/src/corelib/io

Timestamp:

Jan 28, 2010, 10:53:18 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed: QProcess::startDetached() would either crash or fail to start a process.

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -749 +749 @@
                            const QStringList *environment, bool detached = false)
 {
-    int mode = detached ? P_DETACH : P_NOWAIT;
+    int mode = detached ? P_ : P_NOWAIT;
 
     // Create argument list with right number of elements (one extra is for
@@ -916 +916 @@
         const char **argvReal = argv;
 
-        if (mode == P_DETACH) {
-            // @todo P_DETACH isn't supported by kLIBC atm, prepend the program
-            // to start with "cmd.exe /c detach" as a temporary solution
-            mode = P_NOWAIT;
-            programReal = getenv("COMSPEC"); // returns static!
-            if (programReal == 0)
-                programReal = "cmd.exe";
-            argvReal = argvBase;
-            argvReal[0] = programReal;
-            argvReal[1] = "/c";
-            argvReal[2] = "detach";
-            argv[0] = fullProgramName.data();
+        if (mode == P_SESSION) {
+            // @todo P_SESSION isn't supported by kLIBC atm, use DosStartSession
+            // below
         } else {
             // get the application type of our program (note that we cannot use
@@ -968 +959 @@
         // spawnve we have to perform a pointless cast; the devinition for the
         // 3rd and 4th arg should be: char const * const *)
-        pid = spawnve(mode, programReal, const_cast<char * const *>(argvReal), envv);
+        if (mode == P_SESSION) {
+            // @todo P_SESSION isn't supported by kLIBC atm, use DosStartSession
+            bool needCmd = false;
+            int dot = fullProgramName.lastIndexOf('.');
+            Q_ASSERT(dot > 0);
+            if (dot > 0)
+                needCmd = qstricmp(fullProgramName.data() + dot, ".cmd") == 0 ||
+                          qstricmp(fullProgramName.data() + dot, ".bat") == 0;
+
+            QByteArray args;
+            foreach(const QString &arg, arguments)
+                if (!arg.isEmpty())
+                    args += '"' + QFile::encodeName(arg) + '"';
+            if (needCmd) {
+                args.prepend("\" ");
+                args.prepend(programReal);
+                args.prepend("/C \"");
+                programReal = getenv("COMSPEC"); // returns static!
+                if (programReal == 0)
+                    programReal = "cmd.exe";
+             }
+
+            QByteArray env;
+            if (envv != environ)
+                for (char **e = envv; *e; ++e)
+                    env += *e + '\0';
+
+            STARTDATA data;
+            data.Length = sizeof(data);
+            data.Related = SSF_RELATED_INDEPENDENT;
+            data.FgBg = SSF_FGBG_FORE;
+            data.TraceOpt = SSF_TRACEOPT_NONE;
+            data.PgmTitle = 0;
+            data.PgmName = (PSZ)programReal;
+            data.PgmInputs = args.data();
+            data.TermQ = 0;
+            data.Environment = env.isEmpty() ? 0 : env.data();
+            data.InheritOpt = SSF_INHERTOPT_PARENT;
+            data.SessionType = SSF_TYPE_DEFAULT;
+            data.IconFile = 0;
+            data.PgmHandle = 0;
+            data.PgmControl = SSF_CONTROL_VISIBLE;
+            data.InitXPos = data.InitYPos = data.InitXSize = data.InitYSize = 0;
+            data.Reserved = 0;
+            data.ObjectBuffer = 0;
+            data.ObjectBuffLen = 0;
+
+            ULONG ulSid, ulPid;
+            if (DosStartSession(&data, &ulSid, &ulPid) == NO_ERROR)
+                pid = ulPid;
+        } else {
+            pid = spawnve(mode, programReal, const_cast<char * const *>(argvReal), envv);
+        }
 
 #if defined(QPROCESS_DEBUG)
@@ -1657 +1700 @@
         return false;
 
-    *pid = startedPid;
+    if (pid)
+        *pid = startedPid;
     return true;
 }