Changeset 51

Timestamp:

Jan 8, 2006, 8:51:18 PM (20 years ago)

Author:

dmik

Message:

Fixed QProcess:

• workingDirectory() was ignored;
• environment variables added with putenv() to the parent process were not inherited by the child process started with NULL environment.

File:

• trunk/src/kernel/qprocess_pm.cpp (modified) (4 diffs)

trunk/src/kernel/qprocess_pm.cpp

@@ -44 +44 @@
 #include "qtimer.h"
 #include "qregexp.h"
+#include "qdir.h"
 #include "private/qinternal_p.h"
 #include "qt_os2.h"
@@ -285 +286 @@
         envlist.resize( envlist.size() + 1 );
         envlist[ pos ++ ] = 0;
+    } else {
+        // copy the entire environment (to let all variables added using
+        // putenv() appear in the child process)
+        uint sz = 1;
+        for( const char * const *envp = environ; *envp != NULL; ++ envp )
+            sz += strlen( *envp ) + 1;
+        envlist.resize( sz );
+        uint pos = 0;
+        for( const char * const *envp = environ; *envp != NULL; ++ envp ) {
+            sz = strlen( *envp ) + 1;
+            memcpy( envlist.data() + pos, *envp, sz );
+            pos += sz;
+        }
+        // add the terminating 0
+        envlist[ pos ++ ] = 0;
     }
     
@@ -605 +621 @@
     }
 
+    // set the working directory
+    QString curDir = QDir::currentDirPath();
+    QDir::setCurrent( workingDir.path() );
+#if defined(QT_QPROCESS_DEBUG)
+    DosPrintf( tmpStderr != HF_ANY ? tmpStderr : realStderr,
+               "QProcess::start(): curDir='%s', workingDir='%s'\n\r",
+               curDir.local8Bit().data(),
+               QDir::currentDirPath().local8Bit().data() ); 
+#endif
+    
     // DosExecPgm()
     
@@ -611 +637 @@
     rc = DosExecPgm( pathBuf, sizeof(pathBuf), EXEC_ASYNCRESULT,
                      buf.data(), envlist.data(), &resc, appNameFull.data() );
+
+    // restore the current directory
+    QDir::setCurrent( curDir );
     
     // cancel STDIN/OUT/ERR redirections