summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qprocess_unix.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-03-23 08:29:43 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-03-23 08:29:43 +0100
commit8e2d3e3b90d7d35d2c91fc09ab5a9cccac0823e8 (patch)
treefe20315ed91d4babd73df69ece0af1d1550cb40c /src/corelib/io/qprocess_unix.cpp
parentbf17e30c8e98b311cdee397f1272e70863247ebc (diff)
parentf319b9b43c313dfa306a62c391e767bc6f14bdee (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'src/corelib/io/qprocess_unix.cpp')
-rw-r--r--src/corelib/io/qprocess_unix.cpp185
1 files changed, 0 insertions, 185 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index f9d14c8e5a..93807e13eb 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -471,14 +471,8 @@ void QProcessPrivate::startProcess()
}
// Start the process manager, and fork off the child process.
-#if defined(QPROCESS_USE_SPAWN)
- pid_t childPid;
- forkfd = spawnChild(&childPid, workingDirPtr, argv, envp);
- Q_ASSUME(forkfd != FFD_CHILD_PROCESS);
-#else
pid_t childPid;
forkfd = ::forkfd(FFD_CLOEXEC, &childPid);
-#endif
int lastForkErrno = errno;
if (forkfd != FFD_CHILD_PROCESS) {
// Parent process.
@@ -512,12 +506,10 @@ void QProcessPrivate::startProcess()
}
// Start the child.
-#if !defined(QPROCESS_USE_SPAWN)
if (forkfd == FFD_CHILD_PROCESS) {
execChild(workingDirPtr, path, argv, envp);
::_exit(-1);
}
-#endif
pid = Q_PID(childPid);
@@ -556,147 +548,6 @@ void QProcessPrivate::startProcess()
}
}
-#if defined(QPROCESS_USE_SPAWN)
-static int doSpawn(pid_t *ppid, const posix_spawn_file_actions_t *file_actions,
- char **argv, char **envp, const char *workingDir, bool spawn_detached)
-{
- // A multi threaded QNX Process can't fork so we call spawnfd() instead.
- posix_spawnattr_t attr;
- posix_spawnattr_init(&attr);
-# ifdef Q_OS_QNX
- posix_spawnattr_setxflags(&attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETPGROUP
- | (spawn_detached * POSIX_SPAWN_NOZOMBIE));
-# else
- posix_spawnattr_setflags(&attr, POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETPGROUP);
-# endif
- posix_spawnattr_setpgroup(&attr, 0);
-
- sigset_t sigdefault;
- sigemptyset(&sigdefault);
- sigaddset(&sigdefault, SIGPIPE); // reset the signal that we ignored
- posix_spawnattr_setsigdefault(&attr, &sigdefault);
-
- // enter the working directory
- const char *oldWorkingDir = 0;
- char buff[PATH_MAX + 1];
-
- if (workingDir) {
-# ifdef Q_OS_QNX
- //we need to freeze everyone in order to avoid race conditions with //chdir().
- if (ThreadCtl(_NTO_TCTL_THREADS_HOLD, 0) == -1)
- qWarning("ThreadCtl(): cannot hold threads: %s", qPrintable(qt_error_string(errno)));
-# endif
-
- oldWorkingDir = QT_GETCWD(buff, PATH_MAX + 1);
- if (QT_CHDIR(workingDir) == -1)
- qWarning("ThreadCtl(): failed to chdir to %s", workingDir);
- }
-
- int fd;
- if (spawn_detached) {
- fd = ::posix_spawn(ppid, argv[0], file_actions, &attr, argv, envp);
- if (fd == -1) {
- fd = ::posix_spawnp(ppid, argv[0], file_actions, &attr, argv, envp);
- }
- } else {
- // use spawnfd
- fd = ::spawnfd(FFD_CLOEXEC | FFD_NONBLOCK, ppid, argv[0], file_actions, &attr, argv, envp);
- if (fd == -1) {
- fd = ::spawnfd(FFD_CLOEXEC | FFD_NONBLOCK | FFD_SPAWN_SEARCH_PATH, ppid, argv[0], file_actions,
- &attr, argv, envp);
- }
- }
-
- if (oldWorkingDir) {
- if (QT_CHDIR(oldWorkingDir) == -1)
- qWarning("ThreadCtl(): failed to chdir to %s", oldWorkingDir);
-
-# ifdef Q_OS_QNX
- if (Q_UNLIKELY(ThreadCtl(_NTO_TCTL_THREADS_CONT, 0) == -1))
- qFatal("ThreadCtl(): cannot resume threads: %s", qPrintable(qt_error_string(errno)));
-# endif
- }
-
- posix_spawnattr_destroy(&attr);
- return fd;
-}
-
-pid_t QProcessPrivate::spawnChild(pid_t *ppid, const char *workingDir, char **argv, char **envp)
-{
- // posix_spawn causes all file descriptors with FD_CLOEXEC to be closed automatically;
- // we only need to add the actions for our own pipes
- posix_spawn_file_actions_t file_actions;
- posix_spawn_file_actions_init(&file_actions);
-
-# ifdef Q_OS_QNX
- static const bool OS_QNX = true;
-# else
- static const bool OS_QNX = false;
-#endif
-
- int fdmax = -1;
-
- if (processChannelMode == QProcess::MergedChannels) {
- // managed stderr == stdout
- posix_spawn_file_actions_adddup2(&file_actions, stdoutChannel.pipe[1], STDERR_FILENO);
-
- if (OS_QNX)
- fdmax = qMax(fdmax, stdoutChannel.pipe[1]);
- } else if (processChannelMode != QProcess::ForwardedChannels && processChannelMode != QProcess::ForwardedErrorChannel) {
- // managed stderr
- posix_spawn_file_actions_adddup2(&file_actions, stderrChannel.pipe[1], STDERR_FILENO);
-
- if (OS_QNX)
- fdmax = qMax(fdmax, stderrChannel.pipe[1]);
- else
- posix_spawn_file_actions_addclose(&file_actions, stderrChannel.pipe[1]);
-
- }
-
- if (processChannelMode != QProcess::ForwardedChannels && processChannelMode != QProcess::ForwardedOutputChannel) {
- // managed stdout
- posix_spawn_file_actions_adddup2(&file_actions, stdoutChannel.pipe[1], STDOUT_FILENO);
-
- if (OS_QNX)
- fdmax = qMax(fdmax, stdoutChannel.pipe[1]);
- else
- posix_spawn_file_actions_addclose(&file_actions, stdoutChannel.pipe[1]);
-
- }
-
- if (inputChannelMode == QProcess::ManagedInputChannel) {
- posix_spawn_file_actions_adddup2(&file_actions, stdinChannel.pipe[0], STDIN_FILENO);
-
- if (OS_QNX)
- fdmax = qMax(fdmax, stdinChannel.pipe[0]);
- else
- posix_spawn_file_actions_addclose(&file_actions, stdinChannel.pipe[0]);
- }
-
- // Workaround: QNX's spawn implementation will actually dup all FD values
- // LESS than fdmax - regardless of the FD_CLOEEXEC flag. So we need to add
- // those to the list of files to close, otherwise dup will fail when some
- // other thread closes the FD.
- for (int i = 3; i <= fdmax; i++) {
- if (::fcntl(i, F_GETFD) & FD_CLOEXEC)
- posix_spawn_file_actions_addclose(&file_actions, i);
- }
-
- int retval = doSpawn(ppid, &file_actions, argv, envp, workingDir, false);
-
- if (retval == -1) {
- QString error = qt_error_string(errno);
- qt_safe_write(childStartedPipe[1], error.data(), error.length() * sizeof(QChar));
- qt_safe_close(childStartedPipe[1]);
- childStartedPipe[1] = -1;
- }
-
- posix_spawn_file_actions_destroy(&file_actions);
- return retval;
-}
-
-#else
-
void QProcessPrivate::execChild(const char *workingDir, char **path, char **argv, char **envp)
{
::signal(SIGPIPE, SIG_DFL); // reset the signal that we ignored
@@ -770,7 +621,6 @@ report_errno:
qt_safe_close(childStartedPipe[1]);
childStartedPipe[1] = -1;
}
-#endif
bool QProcessPrivate::processStarted(QString *errorMessage)
{
@@ -1064,40 +914,6 @@ bool QProcessPrivate::waitForDeadChild()
return true;
}
-#if defined(QPROCESS_USE_SPAWN)
-bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid)
-{
- QList<QByteArray> enc_args;
- enc_args.append(QFile::encodeName(program));
- for (int i = 0; i < arguments.size(); ++i)
- enc_args.append(arguments.at(i).toLocal8Bit());
-
- const int argc = enc_args.size();
- QScopedArrayPointer<char*> raw_argv(new char*[argc + 1]);
- for (int i = 0; i < argc; ++i)
- raw_argv[i] = const_cast<char *>(enc_args.at(i).data());
- raw_argv[argc] = 0;
-
- char **envp = 0; // inherit environment
-
- // Encode the working directory if it's non-empty, otherwise just pass 0.
- const char *workingDirPtr = 0;
- QByteArray encodedWorkingDirectory;
- if (!workingDirectory.isEmpty()) {
- encodedWorkingDirectory = QFile::encodeName(workingDirectory);
- workingDirPtr = encodedWorkingDirectory.constData();
- }
-
- pid_t childPid;
- int retval = doSpawn(&childPid, NULL, raw_argv.data(), envp, workingDirPtr, true);
- if (pid && retval != -1)
- *pid = childPid;
-
- return retval != -1;
-}
-
-#else
-
bool QProcessPrivate::startDetached(const QString &program, const QStringList &arguments, const QString &workingDirectory, qint64 *pid)
{
QByteArray encodedWorkingDirectory = QFile::encodeName(workingDirectory);
@@ -1212,7 +1028,6 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a
qt_safe_close(pidPipe[0]);
return success;
}
-#endif
QT_END_NAMESPACE