/**
- * \file forkedcall.C
+ * \file forkedcall.C
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "forkedcall.h"
#include "forkedcontr.h"
#include "lstrings.h"
using std::strerror;
#endif
+namespace lyx {
+namespace support {
+
namespace {
if (secs > 0) {
new Murder(secs, pid);
} else if (pid != 0) {
- lyx::kill(pid, SIGKILL);
+ lyx::support::kill(pid, SIGKILL);
}
}
void kill()
{
if (pid_ != 0) {
- lyx::kill(pid_, SIGKILL);
+ lyx::support::kill(pid_, SIGKILL);
}
lyxerr << "Killed " << pid_ << std::endl;
delete this;
// Wait for child process to finish.
-int ForkedProcess::runBlocking()
+int ForkedProcess::runBlocking()
{
retval_ = 0;
pid_ = generateChild();
return retval_;
}
+
+bool ForkedProcess::running() const
+{
+ if (!pid())
+ return false;
+
+ // Un-UNIX like, but we don't have much use for
+ // knowing if a zombie exists, so just reap it first.
+ int waitstatus;
+ waitpid(pid(), &waitstatus, WNOHANG);
+
+ // Racy of course, but it will do.
+ if (::kill(pid(), 0) && errno == ESRCH)
+ return false;
+ return true;
+}
+
+
void ForkedProcess::kill(int tol)
{
- lyxerr << "ForkedProcess::kill(" << tol << ")" << std::endl;
+ lyxerr << "ForkedProcess::kill(" << tol << ')' << endl;
if (pid() == 0) {
lyxerr << "Can't kill non-existent process!" << endl;
return;
Murder::killItDead(0, pid());
} else {
- int ret = lyx::kill(pid(), SIGHUP);
+ int ret = lyx::support::kill(pid(), SIGHUP);
// The process is already dead if wait_for_death is false
bool const wait_for_death = (ret == 0 && errno != ESRCH);
// generate child in background
int Forkedcall::generateChild()
{
- const int MAX_ARGV = 255;
- char *syscmd = 0;
+ // Split command_ up into a char * array
+ int const MAX_ARGV = 255;
char *argv[MAX_ARGV];
- string childcommand(command_); // copy
- bool more = true;
- string rest = split(command_, childcommand, ' ');
-
- int index = 0;
- while (more) {
- childcommand = ltrim(childcommand);
- if (syscmd == 0) {
- syscmd = new char[childcommand.length() + 1];
- childcommand.copy(syscmd, childcommand.length());
- syscmd[childcommand.length()] = '\0';
- }
- if (!childcommand.empty()) {
- char * tmp = new char[childcommand.length() + 1];
- childcommand.copy(tmp, childcommand.length());
- tmp[childcommand.length()] = '\0';
- argv[index++] = tmp;
- }
+ string line = command_;
+ int index = 0;
+ for (; index < MAX_ARGV-1; ++index) {
+ string word;
+ line = split(line, word, ' ');
+ if (word.empty())
+ break;
- // reinit
- more = !rest.empty();
- if (more)
- rest = split(rest, childcommand, ' ');
+ char * tmp = new char[word.length() + 1];
+ word.copy(tmp, word.length());
+ tmp[word.length()] = '\0';
+
+ argv[index] = tmp;
}
argv[index] = 0;
#ifndef __EMX__
- pid_t cpid = ::fork();
+ pid_t const cpid = ::fork();
if (cpid == 0) {
// Child
- execvp(syscmd, argv);
+ execvp(argv[0], argv);
+
// If something goes wrong, we end up here
- string args;
- int i = 0;
- while (argv[i] != 0)
- args += string(" ") + argv[i++];
- lyxerr << "execvp of \"" << syscmd << args << "\" failed: "
+ lyxerr << "execvp of \"" << command_ << "\" failed: "
<< strerror(errno) << endl;
_exit(1);
}
#else
- pid_t cpid = spawnvp(P_SESSION|P_DEFAULT|P_MINIMIZE|P_BACKGROUND,
- syscmd, argv);
+ pid_t const cpid = spawnvp(P_SESSION|P_DEFAULT|P_MINIMIZE|P_BACKGROUND,
+ argv[0], argv);
#endif
if (cpid < 0) {
}
// Clean-up.
- delete [] syscmd;
for (int i = 0; i < MAX_ARGV; ++i) {
if (argv[i] == 0)
break;
return cpid;
}
+
+} // namespace support
+} // namespace lyx