Changeset 73

Timestamp:

Jul 9, 2009, 2:16:47 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: OS/2: Implemented QProcess::startDetached().

File:

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

trunk/src/corelib/io/qprocess_os2.cpp

@@ -243 +243 @@
 }
 
-void QProcessPrivate::startProcess()
-{
-    Q_Q(QProcess);
-
-#if defined (QPROCESS_DEBUG)
-    qDebug("QProcessPrivate::startProcess()");
-#endif
-
-    // Initialize pipes
-    if (!createChannel(stdinChannel) ||
-        !createChannel(stdoutChannel) ||
-        !createChannel(stderrChannel))
-        return;
-
-    // Start the process (platform dependent)
-    q->setProcessState(QProcess::Starting);
-
-    // save & copy the stdin socket
-    int stdin_copy = ::dup(fileno(stdin));
-    ::dup2(stdinChannel.pipe[0], fileno(stdin));
-
-    // save & copy the stdout and stderr if asked to
-    int stdout_copy = -1, stderr_copy = -1;
-    if (processChannelMode != QProcess::ForwardedChannels) {
-        stdout_copy = ::dup(fileno(stdout));
-        ::dup2(stdoutChannel.pipe[1], fileno(stdout));
-
-        // merge stdout and stderr if asked to
-        stderr_copy = ::dup(fileno(stderr));
-        if (processChannelMode == QProcess::MergedChannels) {
-            ::dup2(fileno(stdout), fileno(stderr));
-        } else {
-            ::dup2(stderrChannel.pipe[1], fileno(stderr));
-        }
-    }
+static int qt_startProcess(const QString &program, const QStringList &arguments,
+                           const QString &workingDirectory,
+                           const QStringList *environment, bool detached = false)
+{
+    int mode = detached ? P_DETACH : P_NOWAIT;
 
     // Create argument list with right number of elements, and set the final
@@ -299 +269 @@
     int envc = 0;
     char **envv;
-    if (environment.count()) {
+    if (environmentcount()) {
         bool seenPATH = false;
         bool seenCOMSPEC = false;
 
-        envv = new char *[environment.count() + 1 + 2 /* may be PATH + COMSPEC */];
-        for (; envc < environment.count(); ++envc) {
-            QString item = environment.at(envc);
+        envv = new char *[environmentcount() + 1 + 2 /* may be PATH + COMSPEC */];
+        for (; envc < environmentcount(); ++envc) {
+            QString item = environmentat(envc);
             envv[envc] = qstrdup(item.toLocal8Bit().constData());
             if (!seenPATH)