2002-02-16 12:39:47 +00:00
|
|
|
/**
|
Rename files in src/support, step one.
src/support/package.h src/support/Package.h Package
src/support/package.C.in src/support/Package.C.in Package
src/support/path.h src/support/Path.h Path
src/support/fs_extras.h src/support/fs_extras.h NOCLASSES
src/support/RandomAccessList.h src/support/RandomAccessList.h RandomAccessList
src/support/lyxmanip.h src/support/lyxmanip.h NOCLASSES
src/support/rename.C src/support/rename.cpp NOCLASSES
src/support/abort.C src/support/abort.cpp NOCLASSES
src/support/lyxlib.h src/support/lyxlib.h NOCLASSES
src/support/ExceptionMessage.h src/support/ExceptionMessage.h ExceptionMessage
src/support/copy.C src/support/copy.cpp NOCLASSES
src/support/limited_stack.h src/support/limited_stack.h limited_stack
src/support/filefilterlist.C src/support/FileFilterList.cpp ['FileFilterList', 'Filter']
src/support/cow_ptr.h src/support/cow_ptr.h cow_ptr
src/support/os_unix.C src/support/os_unix.cpp NOCLASSES
src/support/socktools.h src/support/socktools.h NOCLASSES
src/support/forkedcontr.h src/support/ForkedcallsController.h ForkedcallsController
src/support/os.h src/support/os.h NOCLASSES
src/support/FileMonitor.h src/support/FileMonitor.h FileMonitor
src/support/copied_ptr.h src/support/copied_ptr.h copied_ptr
src/support/translator.h src/support/Translator.h Translator
src/support/filetools.C src/support/filetools.cpp NOCLASSES
src/support/unlink.C src/support/unlink.cpp NOCLASSES
src/support/os_win32.C src/support/os_win32.cpp GetFolderPath
src/support/lstrings.C src/support/lstrings.cpp NOCLASSES
src/support/qstring_helpers.C src/support/qstring_helpers.cpp NOCLASSES
src/support/getcwd.C src/support/getcwd.cpp NOCLASSES
src/support/systemcall.C src/support/Systemcall.cpp Systemcall
src/support/lyxalgo.h src/support/lyxalgo.h NOCLASSES
src/support/filefilterlist.h src/support/FileFilterList.h ['FileFilterList', 'Filter']
src/support/unicode.C src/support/unicode.cpp IconvProcessor
src/support/userinfo.C src/support/userinfo.cpp NOCLASSES
src/support/lyxtime.C src/support/lyxtime.cpp NOCLASSES
src/support/kill.C src/support/kill.cpp NOCLASSES
src/support/docstring.C src/support/docstring.cpp to_local8bit_failure
src/support/os_cygwin.C src/support/os_cygwin.cpp NOCLASSES
src/support/lyxsum.C src/support/lyxsum.cpp NOCLASSES
src/support/environment.C src/support/environment.cpp NOCLASSES
src/support/filetools.h src/support/filetools.h NOCLASSES
src/support/textutils.C src/support/textutils.cpp NOCLASSES
src/support/mkdir.C src/support/mkdir.cpp NOCLASSES
src/support/forkedcall.C src/support/Forkedcall.cpp ['ForkedProcess', 'Forkedcall']
src/support/tempname.C src/support/tempname.cpp NOCLASSES
src/support/os_win32.h src/support/os_win32.h GetFolderPath
src/support/types.h src/support/types.h NOCLASSES
src/support/lstrings.h src/support/lstrings.h NOCLASSES
src/support/forkedcallqueue.C src/support/ForkedCallQueue.cpp ForkedCallQueue
src/support/qstring_helpers.h src/support/qstring_helpers.h NOCLASSES
src/support/convert.C src/support/convert.cpp NOCLASSES
src/support/filename.C src/support/FileName.cpp ['FileName', 'DocFileName']
src/support/tests/convert.C src/support/tests/convert.cpp NOCLASSES
src/support/tests/filetools.C src/support/tests/filetools.cpp NOCLASSES
src/support/tests/lstrings.C src/support/tests/lstrings.cpp NOCLASSES
src/support/tests/boost.C src/support/tests/boost.cpp NOCLASSES
src/support/docstream.C src/support/docstream.cpp ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/std_istream.h src/support/std_istream.h NOCLASSES
src/support/systemcall.h src/support/Systemcall.h Systemcall
src/support/chdir.C src/support/chdir.cpp NOCLASSES
src/support/std_ostream.h src/support/std_ostream.h NOCLASSES
src/support/unicode.h src/support/unicode.h IconvProcessor
src/support/path.C src/support/Path.cpp Path
src/support/fs_extras.C src/support/fs_extras.cpp NOCLASSES
src/support/userinfo.h src/support/userinfo.h NOCLASSES
src/support/lyxtime.h src/support/lyxtime.h NOCLASSES
src/support/docstring.h src/support/docstring.h to_local8bit_failure
src/support/debugstream.h src/support/debugstream.h basic_debugstream
src/support/environment.h src/support/environment.h NOCLASSES
src/support/textutils.h src/support/textutils.h NOCLASSES
src/support/forkedcall.h src/support/Forkedcall.h ['ForkedProcess', 'Forkedcall']
src/support/socktools.C src/support/socktools.cpp NOCLASSES
src/support/forkedcallqueue.h src/support/ForkedCallQueue.h ForkedCallQueue
src/support/forkedcontr.C src/support/ForkedcallsController.cpp ForkedcallsController
src/support/os.C src/support/os.cpp NOCLASSES
src/support/convert.h src/support/convert.h NOCLASSES
src/support/filename.h src/support/FileName.h ['FileName', 'DocFileName']
src/support/docstream.h src/support/docstream.h ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/FileMonitor.C src/support/FileMonitor.cpp FileMonitor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 05:12:52 +00:00
|
|
|
* \file Systemcall.cpp
|
2002-09-25 10:03:41 +00:00
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
2002-02-16 12:39:47 +00:00
|
|
|
*
|
|
|
|
* \author Asger Alstrup
|
2002-09-25 10:03:41 +00:00
|
|
|
* \author Angus Leeming
|
2009-12-04 09:51:13 +00:00
|
|
|
* \author Enrico Forestieri
|
|
|
|
* \author Peter Kuemmel
|
2002-09-25 10:03:41 +00:00
|
|
|
*
|
2003-08-23 00:17:00 +00:00
|
|
|
* Full author contact details are available in file CREDITS.
|
2002-02-16 12:39:47 +00:00
|
|
|
*/
|
|
|
|
|
1999-09-27 18:44:28 +00:00
|
|
|
#include <config.h>
|
|
|
|
|
2009-05-11 08:34:08 +00:00
|
|
|
#include "support/debug.h"
|
2009-05-13 18:29:58 +00:00
|
|
|
#include "support/lstrings.h"
|
2009-05-11 08:34:08 +00:00
|
|
|
#include "support/qstring_helpers.h"
|
Rename files in src/support, step one.
src/support/package.h src/support/Package.h Package
src/support/package.C.in src/support/Package.C.in Package
src/support/path.h src/support/Path.h Path
src/support/fs_extras.h src/support/fs_extras.h NOCLASSES
src/support/RandomAccessList.h src/support/RandomAccessList.h RandomAccessList
src/support/lyxmanip.h src/support/lyxmanip.h NOCLASSES
src/support/rename.C src/support/rename.cpp NOCLASSES
src/support/abort.C src/support/abort.cpp NOCLASSES
src/support/lyxlib.h src/support/lyxlib.h NOCLASSES
src/support/ExceptionMessage.h src/support/ExceptionMessage.h ExceptionMessage
src/support/copy.C src/support/copy.cpp NOCLASSES
src/support/limited_stack.h src/support/limited_stack.h limited_stack
src/support/filefilterlist.C src/support/FileFilterList.cpp ['FileFilterList', 'Filter']
src/support/cow_ptr.h src/support/cow_ptr.h cow_ptr
src/support/os_unix.C src/support/os_unix.cpp NOCLASSES
src/support/socktools.h src/support/socktools.h NOCLASSES
src/support/forkedcontr.h src/support/ForkedcallsController.h ForkedcallsController
src/support/os.h src/support/os.h NOCLASSES
src/support/FileMonitor.h src/support/FileMonitor.h FileMonitor
src/support/copied_ptr.h src/support/copied_ptr.h copied_ptr
src/support/translator.h src/support/Translator.h Translator
src/support/filetools.C src/support/filetools.cpp NOCLASSES
src/support/unlink.C src/support/unlink.cpp NOCLASSES
src/support/os_win32.C src/support/os_win32.cpp GetFolderPath
src/support/lstrings.C src/support/lstrings.cpp NOCLASSES
src/support/qstring_helpers.C src/support/qstring_helpers.cpp NOCLASSES
src/support/getcwd.C src/support/getcwd.cpp NOCLASSES
src/support/systemcall.C src/support/Systemcall.cpp Systemcall
src/support/lyxalgo.h src/support/lyxalgo.h NOCLASSES
src/support/filefilterlist.h src/support/FileFilterList.h ['FileFilterList', 'Filter']
src/support/unicode.C src/support/unicode.cpp IconvProcessor
src/support/userinfo.C src/support/userinfo.cpp NOCLASSES
src/support/lyxtime.C src/support/lyxtime.cpp NOCLASSES
src/support/kill.C src/support/kill.cpp NOCLASSES
src/support/docstring.C src/support/docstring.cpp to_local8bit_failure
src/support/os_cygwin.C src/support/os_cygwin.cpp NOCLASSES
src/support/lyxsum.C src/support/lyxsum.cpp NOCLASSES
src/support/environment.C src/support/environment.cpp NOCLASSES
src/support/filetools.h src/support/filetools.h NOCLASSES
src/support/textutils.C src/support/textutils.cpp NOCLASSES
src/support/mkdir.C src/support/mkdir.cpp NOCLASSES
src/support/forkedcall.C src/support/Forkedcall.cpp ['ForkedProcess', 'Forkedcall']
src/support/tempname.C src/support/tempname.cpp NOCLASSES
src/support/os_win32.h src/support/os_win32.h GetFolderPath
src/support/types.h src/support/types.h NOCLASSES
src/support/lstrings.h src/support/lstrings.h NOCLASSES
src/support/forkedcallqueue.C src/support/ForkedCallQueue.cpp ForkedCallQueue
src/support/qstring_helpers.h src/support/qstring_helpers.h NOCLASSES
src/support/convert.C src/support/convert.cpp NOCLASSES
src/support/filename.C src/support/FileName.cpp ['FileName', 'DocFileName']
src/support/tests/convert.C src/support/tests/convert.cpp NOCLASSES
src/support/tests/filetools.C src/support/tests/filetools.cpp NOCLASSES
src/support/tests/lstrings.C src/support/tests/lstrings.cpp NOCLASSES
src/support/tests/boost.C src/support/tests/boost.cpp NOCLASSES
src/support/docstream.C src/support/docstream.cpp ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/std_istream.h src/support/std_istream.h NOCLASSES
src/support/systemcall.h src/support/Systemcall.h Systemcall
src/support/chdir.C src/support/chdir.cpp NOCLASSES
src/support/std_ostream.h src/support/std_ostream.h NOCLASSES
src/support/unicode.h src/support/unicode.h IconvProcessor
src/support/path.C src/support/Path.cpp Path
src/support/fs_extras.C src/support/fs_extras.cpp NOCLASSES
src/support/userinfo.h src/support/userinfo.h NOCLASSES
src/support/lyxtime.h src/support/lyxtime.h NOCLASSES
src/support/docstring.h src/support/docstring.h to_local8bit_failure
src/support/debugstream.h src/support/debugstream.h basic_debugstream
src/support/environment.h src/support/environment.h NOCLASSES
src/support/textutils.h src/support/textutils.h NOCLASSES
src/support/forkedcall.h src/support/Forkedcall.h ['ForkedProcess', 'Forkedcall']
src/support/socktools.C src/support/socktools.cpp NOCLASSES
src/support/forkedcallqueue.h src/support/ForkedCallQueue.h ForkedCallQueue
src/support/forkedcontr.C src/support/ForkedcallsController.cpp ForkedcallsController
src/support/os.C src/support/os.cpp NOCLASSES
src/support/convert.h src/support/convert.h NOCLASSES
src/support/filename.h src/support/FileName.h ['FileName', 'DocFileName']
src/support/docstream.h src/support/docstream.h ['iconv_codecvt_facet_exception', 'idocfstream', 'odocfstream']
src/support/FileMonitor.C src/support/FileMonitor.cpp FileMonitor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 05:12:52 +00:00
|
|
|
#include "support/Systemcall.h"
|
2009-05-16 15:55:08 +00:00
|
|
|
#include "support/SystemcallPrivate.h"
|
Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,
22077, 22078, 22079, 22080, 22081.
Sorry Peter, but this was breaking too many things, see discussions
on lyx-devel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:25:53 +00:00
|
|
|
#include "support/os.h"
|
2009-12-20 14:26:55 +00:00
|
|
|
#include "support/ProgressInterface.h"
|
2002-02-18 19:13:48 +00:00
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,
22077, 22078, 22079, 22080, 22081.
Sorry Peter, but this was breaking too many things, see discussions
on lyx-devel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:25:53 +00:00
|
|
|
#include <cstdlib>
|
2009-05-11 11:51:52 +00:00
|
|
|
#include <iostream>
|
2003-06-30 23:56:22 +00:00
|
|
|
|
2009-05-10 19:39:56 +00:00
|
|
|
#include <QProcess>
|
2009-12-04 09:51:13 +00:00
|
|
|
#include <QTime>
|
|
|
|
#include <QThread>
|
|
|
|
#include <QCoreApplication>
|
2009-12-04 11:08:24 +00:00
|
|
|
#include <QDebug>
|
2009-05-10 19:39:56 +00:00
|
|
|
|
2009-05-11 22:03:52 +00:00
|
|
|
#define USE_QPROCESS
|
2009-05-11 09:01:44 +00:00
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
|
|
|
struct Sleep : QThread
|
|
|
|
{
|
|
|
|
static void millisec(unsigned long ms)
|
|
|
|
{
|
|
|
|
QThread::usleep(ms * 1000);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-12-20 14:26:55 +00:00
|
|
|
|
2007-12-12 19:28:07 +00:00
|
|
|
using namespace std;
|
2007-12-08 20:46:03 +00:00
|
|
|
|
Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,
22077, 22078, 22079, 22080, 22081.
Sorry Peter, but this was breaking too many things, see discussions
on lyx-devel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:25:53 +00:00
|
|
|
namespace lyx {
|
|
|
|
namespace support {
|
2007-12-08 20:46:03 +00:00
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-12-20 14:26:55 +00:00
|
|
|
class ProgressDummy : public ProgressInterface
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
ProgressDummy() {}
|
|
|
|
|
|
|
|
void processStarted(QString const &) {}
|
|
|
|
void processFinished(QString const &) {}
|
|
|
|
void appendMessage(QString const &) {}
|
|
|
|
void appendError(QString const &) {}
|
|
|
|
void clearMessages() {}
|
2009-12-21 11:48:19 +00:00
|
|
|
|
|
|
|
void warning(QString const &, QString const &) {}
|
|
|
|
void toggleWarning(QString const &, QString const &, QString const &) {}
|
|
|
|
void error(QString const &, QString const &) {}
|
|
|
|
void information(QString const &, QString const &) {}
|
2009-12-20 14:26:55 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static ProgressInterface* progress_instance = 0;
|
|
|
|
|
|
|
|
void ProgressInterface::setInstance(ProgressInterface* p)
|
|
|
|
{
|
|
|
|
progress_instance = p;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ProgressInterface* ProgressInterface::instance()
|
|
|
|
{
|
|
|
|
if (!progress_instance) {
|
|
|
|
static ProgressDummy dummy;
|
|
|
|
return &dummy;
|
|
|
|
}
|
|
|
|
return progress_instance;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,
22077, 22078, 22079, 22080, 22081.
Sorry Peter, but this was breaking too many things, see discussions
on lyx-devel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:25:53 +00:00
|
|
|
// Reuse of instance
|
2009-05-13 18:29:58 +00:00
|
|
|
#ifndef USE_QPROCESS
|
2009-12-12 14:04:21 +00:00
|
|
|
int Systemcall::startscript(Starttype how, string const & what,
|
|
|
|
bool /*process_events*/)
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,
22077, 22078, 22079, 22080, 22081.
Sorry Peter, but this was breaking too many things, see discussions
on lyx-devel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 18:25:53 +00:00
|
|
|
string command = what;
|
|
|
|
|
|
|
|
if (how == DontWait) {
|
|
|
|
switch (os::shell()) {
|
|
|
|
case os::UNIX:
|
|
|
|
command += " &";
|
|
|
|
break;
|
|
|
|
case os::CMD_EXE:
|
|
|
|
command = "start /min " + command;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-11 09:01:44 +00:00
|
|
|
return ::system(command.c_str());
|
2009-05-13 18:29:58 +00:00
|
|
|
}
|
|
|
|
|
2009-05-11 09:01:44 +00:00
|
|
|
#else
|
2009-05-13 18:29:58 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
2009-12-19 17:26:09 +00:00
|
|
|
/*
|
|
|
|
* This is a parser that (mostly) mimics the behavior of a posix shell but
|
|
|
|
* its output is tailored for being processed by QProcess.
|
|
|
|
*
|
|
|
|
* The escape character is the backslash.
|
|
|
|
* A backslash that is not quoted preserves the literal value of the following
|
|
|
|
* character, with the exception of a double-quote '"'. If a double-quote
|
|
|
|
* follows a backslash, it will be replaced by three consecutive double-quotes
|
|
|
|
* (this is how the QProcess parser recognizes a '"' as a simple character
|
|
|
|
* instead of a quoting character). Thus, for example:
|
|
|
|
* \\ -> \
|
|
|
|
* \a -> a
|
|
|
|
* \" -> """
|
|
|
|
*
|
|
|
|
* Single-quotes.
|
|
|
|
* Characters enclosed in single-quotes ('') have their literal value preserved.
|
|
|
|
* A single-quote cannot occur within single-quotes. Indeed, a backslash cannot
|
|
|
|
* be used to escape a single-quote in a single-quoted string. In other words,
|
|
|
|
* anything enclosed in single-quotes is passed as is, but the single-quotes
|
|
|
|
* themselves are eliminated. Thus, for example:
|
|
|
|
* '\' -> \
|
|
|
|
* '\\' -> \\
|
|
|
|
* '\a' -> \a
|
|
|
|
* 'a\"b' -> a\"b
|
|
|
|
*
|
|
|
|
* Double-quotes.
|
|
|
|
* Characters enclosed in double-quotes ("") have their literal value preserved,
|
|
|
|
* with the exception of the backslash. The backslash retains its special
|
|
|
|
* meaning as an escape character only when followed by a double-quote.
|
|
|
|
* Contrarily to the behavior of a posix shell, the double-quotes themselves
|
|
|
|
* are *not* eliminated. Thus, for example:
|
|
|
|
* "\\" -> "\\"
|
|
|
|
* "\a" -> "\a"
|
|
|
|
* "a\"b" -> "a"""b"
|
|
|
|
*/
|
|
|
|
string const parsecmd(string const & inputcmd, string & outfile)
|
2009-05-13 18:29:58 +00:00
|
|
|
{
|
2009-12-19 17:26:09 +00:00
|
|
|
bool in_single_quote = false;
|
|
|
|
bool in_double_quote = false;
|
2009-05-13 18:29:58 +00:00
|
|
|
bool escaped = false;
|
2009-12-19 17:26:09 +00:00
|
|
|
string cmd;
|
|
|
|
|
|
|
|
for (size_t i = 0; i < inputcmd.length(); ++i) {
|
|
|
|
char c = inputcmd[i];
|
|
|
|
if (c == '\'') {
|
|
|
|
if (in_double_quote || escaped) {
|
|
|
|
if (in_double_quote && escaped)
|
|
|
|
cmd += '\\';
|
|
|
|
cmd += c;
|
|
|
|
} else
|
|
|
|
in_single_quote = !in_single_quote;
|
|
|
|
escaped = false;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (in_single_quote) {
|
|
|
|
cmd += c;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (c == '"') {
|
|
|
|
if (escaped) {
|
|
|
|
cmd += "\"\"\"";
|
|
|
|
escaped = false;
|
|
|
|
} else {
|
|
|
|
cmd += c;
|
|
|
|
in_double_quote = !in_double_quote;
|
|
|
|
}
|
|
|
|
} else if (c == '\\' && !escaped) {
|
2009-05-13 18:29:58 +00:00
|
|
|
escaped = !escaped;
|
2009-12-19 17:26:09 +00:00
|
|
|
} else if (c == '>' && !(in_double_quote || escaped)) {
|
|
|
|
outfile = trim(inputcmd.substr(i + 1), " \"");
|
|
|
|
return trim(cmd);
|
|
|
|
} else {
|
|
|
|
if (escaped && in_double_quote)
|
|
|
|
cmd += '\\';
|
|
|
|
cmd += c;
|
2009-05-13 18:29:58 +00:00
|
|
|
escaped = false;
|
2009-12-19 17:26:09 +00:00
|
|
|
}
|
2009-05-13 18:29:58 +00:00
|
|
|
}
|
|
|
|
outfile.erase();
|
|
|
|
return cmd;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-12-04 13:28:30 +00:00
|
|
|
int Systemcall::startscript(Starttype how, string const & what, bool process_events)
|
2009-05-13 18:29:58 +00:00
|
|
|
{
|
|
|
|
string outfile;
|
2009-12-18 19:35:32 +00:00
|
|
|
QString cmd = toqstr(parsecmd(what, outfile));
|
2009-12-18 12:20:22 +00:00
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
SystemcallPrivate d(outfile);
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
d.startProcess(cmd);
|
2009-12-06 22:43:38 +00:00
|
|
|
if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
|
2009-12-13 09:32:38 +00:00
|
|
|
LYXERR0("Systemcall: '" << cmd << "' did not start!");
|
2009-12-04 09:51:13 +00:00
|
|
|
LYXERR0("error " << d.errorMessage());
|
2009-05-11 08:34:08 +00:00
|
|
|
return 10;
|
|
|
|
}
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-05-14 15:13:58 +00:00
|
|
|
if (how == DontWait) {
|
2009-12-04 10:35:32 +00:00
|
|
|
QProcess* released = d.releaseProcess();
|
|
|
|
(void) released; // TODO who deletes it?
|
2009-05-11 09:01:44 +00:00
|
|
|
return 0;
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
2009-05-11 09:01:44 +00:00
|
|
|
|
2009-12-04 10:39:48 +00:00
|
|
|
if (!d.waitWhile(SystemcallPrivate::Running, process_events, 180000)) {
|
2009-12-13 09:30:28 +00:00
|
|
|
LYXERR0("Systemcall: '" << cmd << "' did not finished!");
|
2009-12-04 09:51:13 +00:00
|
|
|
LYXERR0("error " << d.errorMessage());
|
|
|
|
LYXERR0("status " << d.exitStatusMessage());
|
2009-05-11 08:34:08 +00:00
|
|
|
return 20;
|
|
|
|
}
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
int const exit_code = d.exitCode();
|
2009-05-11 09:01:44 +00:00
|
|
|
if (exit_code) {
|
2009-12-13 09:30:28 +00:00
|
|
|
LYXERR0("Systemcall: '" << cmd << "' finished with exit code " << exit_code);
|
2009-05-11 08:34:08 +00:00
|
|
|
}
|
2009-05-13 12:55:01 +00:00
|
|
|
|
2009-05-11 09:01:44 +00:00
|
|
|
return exit_code;
|
1999-09-27 18:44:28 +00:00
|
|
|
}
|
2009-05-14 15:13:58 +00:00
|
|
|
|
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
SystemcallPrivate::SystemcallPrivate(const std::string& of) :
|
2009-12-04 11:48:38 +00:00
|
|
|
proc_(new QProcess), outindex_(0), errindex_(0),
|
|
|
|
outfile(of), showout_(false), showerr_(false), process_events(false)
|
2009-05-14 15:13:58 +00:00
|
|
|
{
|
2009-12-04 10:11:06 +00:00
|
|
|
if (!outfile.empty()) {
|
|
|
|
// Check whether we have to simply throw away the output.
|
|
|
|
if (outfile != os::nulldev())
|
|
|
|
proc_->setStandardOutputFile(toqstr(outfile));
|
|
|
|
} else if (os::is_terminal(os::STDOUT))
|
2009-12-20 14:26:55 +00:00
|
|
|
setShowOut(true);
|
2009-12-04 10:11:06 +00:00
|
|
|
if (os::is_terminal(os::STDERR))
|
2009-12-20 14:26:55 +00:00
|
|
|
setShowErr(true);
|
2009-12-04 10:11:06 +00:00
|
|
|
|
|
|
|
connect(proc_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut()));
|
|
|
|
connect(proc_, SIGNAL(readyReadStandardError()), SLOT(stdErr()));
|
|
|
|
connect(proc_, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
|
|
|
|
connect(proc_, SIGNAL(started()), this, SLOT(processStarted()));
|
|
|
|
connect(proc_, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
|
2009-12-04 09:51:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void SystemcallPrivate::startProcess(const QString& cmd)
|
|
|
|
{
|
2009-12-20 14:26:55 +00:00
|
|
|
cmd_ = cmd;
|
2009-12-04 10:35:32 +00:00
|
|
|
if (proc_) {
|
|
|
|
state = SystemcallPrivate::Starting;
|
2009-12-20 14:26:55 +00:00
|
|
|
proc_->start(cmd_);
|
2009-12-04 10:35:32 +00:00
|
|
|
}
|
2009-12-04 09:51:13 +00:00
|
|
|
}
|
|
|
|
|
2009-12-04 11:48:38 +00:00
|
|
|
|
2009-12-04 11:08:24 +00:00
|
|
|
void SystemcallPrivate::processEvents()
|
|
|
|
{
|
2009-12-20 14:27:19 +00:00
|
|
|
if(process_events) {
|
|
|
|
QCoreApplication::processEvents(/*QEventLoop::ExcludeUserInputEvents*/);
|
|
|
|
}
|
2009-12-04 11:08:24 +00:00
|
|
|
}
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-12-04 11:48:38 +00:00
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
void SystemcallPrivate::waitAndProcessEvents()
|
|
|
|
{
|
|
|
|
Sleep::millisec(100);
|
2009-12-04 11:08:24 +00:00
|
|
|
processEvents();
|
2009-12-04 09:51:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 11:08:24 +00:00
|
|
|
bool SystemcallPrivate::waitWhile(State waitwhile, bool proc_events, int timeout)
|
2009-12-04 09:51:13 +00:00
|
|
|
{
|
2009-12-04 10:35:32 +00:00
|
|
|
if (!proc_)
|
|
|
|
return false;
|
|
|
|
|
2009-12-04 11:08:24 +00:00
|
|
|
process_events = proc_events;
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
// Block GUI while waiting,
|
|
|
|
// relay on QProcess' wait functions
|
2009-12-04 10:39:48 +00:00
|
|
|
if (!process_events) {
|
2009-12-04 09:51:13 +00:00
|
|
|
if (waitwhile == Starting)
|
|
|
|
return proc_->waitForStarted(timeout);
|
|
|
|
if (waitwhile == Running)
|
|
|
|
return proc_->waitForFinished(timeout);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// process events while waiting, no timeout
|
|
|
|
if (timeout == -1) {
|
|
|
|
while (state == waitwhile && state != Error) {
|
|
|
|
waitAndProcessEvents();
|
|
|
|
}
|
|
|
|
return state != Error;
|
|
|
|
}
|
|
|
|
|
|
|
|
// process events while waiting whith timeout
|
|
|
|
QTime timer;
|
|
|
|
timer.start();
|
|
|
|
while (state == waitwhile && state != Error && timer.elapsed() < timeout) {
|
|
|
|
waitAndProcessEvents();
|
|
|
|
}
|
|
|
|
return (state != Error) && (timer.elapsed() < timeout);
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
SystemcallPrivate::~SystemcallPrivate()
|
2009-05-14 15:13:58 +00:00
|
|
|
{
|
2009-12-04 10:35:32 +00:00
|
|
|
flush();
|
|
|
|
|
2009-05-15 09:20:59 +00:00
|
|
|
if (outindex_) {
|
|
|
|
outdata_[outindex_] = '\0';
|
|
|
|
outindex_ = 0;
|
2009-12-20 14:26:55 +00:00
|
|
|
if (showout_)
|
|
|
|
cout << outdata_;
|
2009-05-15 09:20:59 +00:00
|
|
|
}
|
2009-05-14 15:13:58 +00:00
|
|
|
cout.flush();
|
2009-05-15 09:20:59 +00:00
|
|
|
if (errindex_) {
|
|
|
|
errdata_[errindex_] = '\0';
|
|
|
|
errindex_ = 0;
|
2009-12-20 14:26:55 +00:00
|
|
|
if (showerr_)
|
|
|
|
cerr << errdata_;
|
2009-05-15 09:20:59 +00:00
|
|
|
}
|
2009-05-14 15:13:58 +00:00
|
|
|
cerr.flush();
|
2009-12-04 10:35:32 +00:00
|
|
|
|
|
|
|
killProcess();
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
void SystemcallPrivate::flush()
|
|
|
|
{
|
2009-12-04 10:35:32 +00:00
|
|
|
if (proc_) {
|
|
|
|
// If the output has been redirected, we write it all at once.
|
|
|
|
// Even if we are not running in a terminal, the output could go
|
|
|
|
// to some log file, for example ~/.xsession-errors on *nix.
|
|
|
|
if (!os::is_terminal(os::STDOUT) && outfile.empty())
|
|
|
|
cout << fromqstr(QString::fromLocal8Bit(
|
|
|
|
proc_->readAllStandardOutput().data()));
|
|
|
|
if (!os::is_terminal(os::STDERR))
|
|
|
|
cerr << fromqstr(QString::fromLocal8Bit(
|
|
|
|
proc_->readAllStandardError().data()));
|
|
|
|
}
|
2009-12-04 10:11:06 +00:00
|
|
|
}
|
|
|
|
|
2009-12-04 11:48:38 +00:00
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
void SystemcallPrivate::stdOut()
|
2009-05-14 15:13:58 +00:00
|
|
|
{
|
2009-12-20 14:26:55 +00:00
|
|
|
if (proc_) {
|
2009-05-14 15:13:58 +00:00
|
|
|
char c;
|
|
|
|
proc_->setReadChannel(QProcess::StandardOutput);
|
|
|
|
while (proc_->getChar(&c)) {
|
|
|
|
outdata_[outindex_++] = c;
|
|
|
|
if (c == '\n' || outindex_ + 1 == bufsize_) {
|
|
|
|
outdata_[outindex_] = '\0';
|
|
|
|
outindex_ = 0;
|
2009-12-20 14:26:55 +00:00
|
|
|
if (showout_)
|
|
|
|
cout << outdata_;
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-12-20 14:26:55 +00:00
|
|
|
const QString data = QString::fromLocal8Bit(outdata_);
|
2009-12-21 11:48:19 +00:00
|
|
|
if (!data.isEmpty()) {
|
|
|
|
// TODO No good messages from the processes. Disable batch mode?
|
|
|
|
//ProgressInterface::instance()->appendMessage(data);
|
|
|
|
}
|
2009-12-04 11:08:24 +00:00
|
|
|
processEvents();
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
void SystemcallPrivate::stdErr()
|
2009-05-14 15:13:58 +00:00
|
|
|
{
|
2009-12-20 14:26:55 +00:00
|
|
|
if (proc_) {
|
2009-05-14 15:13:58 +00:00
|
|
|
char c;
|
|
|
|
proc_->setReadChannel(QProcess::StandardError);
|
|
|
|
while (proc_->getChar(&c)) {
|
|
|
|
errdata_[errindex_++] = c;
|
|
|
|
if (c == '\n' || errindex_ + 1 == bufsize_) {
|
|
|
|
errdata_[errindex_] = '\0';
|
|
|
|
errindex_ = 0;
|
2009-12-20 14:26:55 +00:00
|
|
|
if (showerr_)
|
|
|
|
cerr << errdata_;
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-12-20 14:26:55 +00:00
|
|
|
const QString data = QString::fromLocal8Bit(errdata_);
|
|
|
|
if (!data.isEmpty())
|
|
|
|
ProgressInterface::instance()->appendError(data);
|
2009-12-04 11:08:24 +00:00
|
|
|
processEvents();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SystemcallPrivate::processStarted()
|
|
|
|
{
|
|
|
|
state = Running;
|
2009-12-20 14:26:55 +00:00
|
|
|
ProgressInterface::instance()->processStarted(cmd_);
|
2009-12-04 11:08:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 11:51:39 +00:00
|
|
|
void SystemcallPrivate::processFinished(int, QProcess::ExitStatus)
|
2009-12-04 11:08:24 +00:00
|
|
|
{
|
|
|
|
state = Finished;
|
2009-12-20 14:26:55 +00:00
|
|
|
ProgressInterface::instance()->processFinished(cmd_);
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-12-04 11:51:39 +00:00
|
|
|
void SystemcallPrivate::processError(QProcess::ProcessError)
|
2009-12-04 09:51:13 +00:00
|
|
|
{
|
|
|
|
state = Error;
|
2009-12-20 14:26:55 +00:00
|
|
|
ProgressInterface::instance()->appendError(errorMessage());
|
2009-12-04 09:51:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
QString SystemcallPrivate::errorMessage() const
|
|
|
|
{
|
2009-12-04 10:35:32 +00:00
|
|
|
if (!proc_)
|
|
|
|
return "No QProcess available";
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
QString message;
|
|
|
|
switch (proc_->error()) {
|
|
|
|
case QProcess::FailedToStart:
|
|
|
|
message = "The process failed to start. Either the invoked program is missing, "
|
|
|
|
"or you may have insufficient permissions to invoke the program.";
|
|
|
|
break;
|
|
|
|
case QProcess::Crashed:
|
|
|
|
message = "The process crashed some time after starting successfully.";
|
|
|
|
break;
|
|
|
|
case QProcess::Timedout:
|
|
|
|
message = "The process timed out. It might be restarted automatically.";
|
|
|
|
break;
|
|
|
|
case QProcess::WriteError:
|
|
|
|
message = "An error occurred when attempting to write to the process-> For example, "
|
|
|
|
"the process may not be running, or it may have closed its input channel.";
|
|
|
|
break;
|
|
|
|
case QProcess::ReadError:
|
|
|
|
message = "An error occurred when attempting to read from the process-> For example, "
|
|
|
|
"the process may not be running.";
|
|
|
|
break;
|
|
|
|
case QProcess::UnknownError:
|
|
|
|
default:
|
|
|
|
message = "An unknown error occured.";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return message;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
QString SystemcallPrivate::exitStatusMessage() const
|
|
|
|
{
|
2009-12-04 10:35:32 +00:00
|
|
|
if (!proc_)
|
|
|
|
return "No QProcess available";
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
QString message;
|
|
|
|
switch (proc_->exitStatus()) {
|
|
|
|
case QProcess::NormalExit:
|
|
|
|
message = "The process exited normally.";
|
|
|
|
break;
|
|
|
|
case QProcess::CrashExit:
|
|
|
|
message = "The process crashed.";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
message = "Unknown exit state.";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return message;
|
|
|
|
}
|
|
|
|
|
2009-12-04 11:48:38 +00:00
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
int SystemcallPrivate::exitCode()
|
|
|
|
{
|
2009-12-04 10:35:32 +00:00
|
|
|
if (!proc_)
|
|
|
|
return -1;
|
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
return proc_->exitCode();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 10:35:32 +00:00
|
|
|
QProcess* SystemcallPrivate::releaseProcess()
|
|
|
|
{
|
|
|
|
QProcess* released = proc_;
|
|
|
|
proc_ = 0;
|
|
|
|
return released;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
void SystemcallPrivate::killProcess()
|
|
|
|
{
|
|
|
|
killProcess(proc_);
|
|
|
|
}
|
|
|
|
|
2009-12-04 11:48:38 +00:00
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
void SystemcallPrivate::killProcess(QProcess * p)
|
|
|
|
{
|
2009-12-04 10:35:32 +00:00
|
|
|
if (p) {
|
|
|
|
p->disconnect();
|
|
|
|
p->closeReadChannel(QProcess::StandardOutput);
|
|
|
|
p->closeReadChannel(QProcess::StandardError);
|
|
|
|
p->close();
|
|
|
|
delete p;
|
|
|
|
}
|
2009-12-04 10:11:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2009-05-16 15:55:08 +00:00
|
|
|
#include "moc_SystemcallPrivate.cpp"
|
2009-05-13 18:29:58 +00:00
|
|
|
#endif
|
2003-06-30 23:56:22 +00:00
|
|
|
|
|
|
|
} // namespace support
|
|
|
|
} // namespace lyx
|