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"
|
Introduce the possibility of setting a prefix for the TEXINPUTS environment
variable. This is done in the preferences, much like as the PATH prefix.
A single '.' in the paths will get replaced with the current document dir
and also non-absolute paths will be prefixed with that dir.
The default semantics of TEXINPUTS apply, such that, for example, if a
path is terminated with a double slash, all subdirectories will be also
searched by both the TeX engine and ancillary programs such as dvi
previewers or dvips. As an example, if the prefix is set to ".:figs", the
TEXINPUTS variable will be set as ".:<docdir>:<docdir>/figs:$ORIGTEXINPUTS",
where <docdir> is the document directory.
The initial '.' is necessary to address the actual current dir (this will
be the temp dir at preview time), while if TEXINPUTS was initially unset,
such that $ORIGTEXINPUTS is empty, a colon (or semicolon on Windows) will
end the path list. This is very important, because we don't want to replace
the system directories but to complement them and, in order to do that, an
empty element has to be present in the list. Indeed, according to the
TEXINPUTS semantics, an empty element means the standard search path.
This works whether TEXINPUTS is originally set or not, because if the
original TEXINPUTS starts with a colon (meaning that the standard search
path is wanted there) we will have an empty element at that point,
otherwise the final colon will simply serve as a path separator.
Of course, on Windows a ';' has to be used as a path separator. LyX will
take care of transforming the platform path list into one understandable
by the TeX engine. For example, this will be the case for a Cygwin version
of LyX using a native Windows TeX engine or viceversa. I tested all of
this and it works for me.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38681 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 23:25:51 +00:00
|
|
|
#include "support/filetools.h"
|
2012-02-18 14:16:25 +00:00
|
|
|
#include "support/gettext.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
|
|
|
|
Introduce the possibility of setting a prefix for the TEXINPUTS environment
variable. This is done in the preferences, much like as the PATH prefix.
A single '.' in the paths will get replaced with the current document dir
and also non-absolute paths will be prefixed with that dir.
The default semantics of TEXINPUTS apply, such that, for example, if a
path is terminated with a double slash, all subdirectories will be also
searched by both the TeX engine and ancillary programs such as dvi
previewers or dvips. As an example, if the prefix is set to ".:figs", the
TEXINPUTS variable will be set as ".:<docdir>:<docdir>/figs:$ORIGTEXINPUTS",
where <docdir> is the document directory.
The initial '.' is necessary to address the actual current dir (this will
be the temp dir at preview time), while if TEXINPUTS was initially unset,
such that $ORIGTEXINPUTS is empty, a colon (or semicolon on Windows) will
end the path list. This is very important, because we don't want to replace
the system directories but to complement them and, in order to do that, an
empty element has to be present in the list. Indeed, according to the
TEXINPUTS semantics, an empty element means the standard search path.
This works whether TEXINPUTS is originally set or not, because if the
original TEXINPUTS starts with a colon (meaning that the standard search
path is wanted there) we will have an empty element at that point,
otherwise the final colon will simply serve as a path separator.
Of course, on Windows a ';' has to be used as a path separator. LyX will
take care of transforming the platform path list into one understandable
by the TeX engine. For example, this will be the case for a Cygwin version
of LyX using a native Windows TeX engine or viceversa. I tested all of
this and it works for me.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38681 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 23:25:51 +00:00
|
|
|
#include "LyXRC.h"
|
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-12-27 13:43:42 +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-29 15:05:37 +00:00
|
|
|
void lyxerrFlush() {}
|
|
|
|
|
|
|
|
void lyxerrConnect() {}
|
|
|
|
void lyxerrDisconnect() {}
|
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 &) {}
|
2012-02-18 14:16:25 +00:00
|
|
|
int prompt(docstring const &, docstring const &, int default_but, int,
|
|
|
|
docstring const &, docstring const &) { return default_but; }
|
2009-12-20 14:26:55 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2013-10-07 22:59:05 +00:00
|
|
|
static ProgressInterface * progress_instance = 0;
|
2009-12-20 14:26:55 +00:00
|
|
|
|
|
|
|
void ProgressInterface::setInstance(ProgressInterface* p)
|
|
|
|
{
|
|
|
|
progress_instance = p;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-10-07 22:59:05 +00:00
|
|
|
ProgressInterface * ProgressInterface::instance()
|
2009-12-20 14:26:55 +00:00
|
|
|
{
|
|
|
|
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,
|
Introduce the possibility of setting a prefix for the TEXINPUTS environment
variable. This is done in the preferences, much like as the PATH prefix.
A single '.' in the paths will get replaced with the current document dir
and also non-absolute paths will be prefixed with that dir.
The default semantics of TEXINPUTS apply, such that, for example, if a
path is terminated with a double slash, all subdirectories will be also
searched by both the TeX engine and ancillary programs such as dvi
previewers or dvips. As an example, if the prefix is set to ".:figs", the
TEXINPUTS variable will be set as ".:<docdir>:<docdir>/figs:$ORIGTEXINPUTS",
where <docdir> is the document directory.
The initial '.' is necessary to address the actual current dir (this will
be the temp dir at preview time), while if TEXINPUTS was initially unset,
such that $ORIGTEXINPUTS is empty, a colon (or semicolon on Windows) will
end the path list. This is very important, because we don't want to replace
the system directories but to complement them and, in order to do that, an
empty element has to be present in the list. Indeed, according to the
TEXINPUTS semantics, an empty element means the standard search path.
This works whether TEXINPUTS is originally set or not, because if the
original TEXINPUTS starts with a colon (meaning that the standard search
path is wanted there) we will have an empty element at that point,
otherwise the final colon will simply serve as a path separator.
Of course, on Windows a ';' has to be used as a path separator. LyX will
take care of transforming the platform path list into one understandable
by the TeX engine. For example, this will be the case for a Cygwin version
of LyX using a native Windows TeX engine or viceversa. I tested all of
this and it works for me.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38681 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 23:25:51 +00:00
|
|
|
std::string const & path, bool /*process_events*/)
|
1999-09-27 18:44:28 +00:00
|
|
|
{
|
2011-10-28 11:51:48 +00:00
|
|
|
string const python_call = "python -tt";
|
|
|
|
string command = to_filesystem8bit(from_utf8(latexEnvCmdPrefix(path)));
|
|
|
|
|
|
|
|
if (prefixIs(what, python_call))
|
|
|
|
command += os::python() + what.substr(python_call.length());
|
|
|
|
else
|
|
|
|
command += what;
|
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
|
|
|
|
|
|
|
if (how == DontWait) {
|
|
|
|
switch (os::shell()) {
|
|
|
|
case os::UNIX:
|
|
|
|
command += " &";
|
|
|
|
break;
|
|
|
|
case os::CMD_EXE:
|
|
|
|
command = "start /min " + command;
|
|
|
|
break;
|
|
|
|
}
|
2011-09-25 13:35:42 +00:00
|
|
|
} else if (os::shell() == os::CMD_EXE)
|
|
|
|
command = subst(command, "cmd /d /c ", "");
|
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
|
|
|
|
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
|
|
|
/*
|
2011-10-31 02:02:27 +00:00
|
|
|
* This is a parser that (mostly) mimics the behavior of a posix shell as
|
|
|
|
* regards quoting, but its output is tailored for being processed by QProcess.
|
2012-01-22 12:35:07 +00:00
|
|
|
* Note that shell metacharacters are not parsed.
|
2009-12-19 17:26:09 +00:00
|
|
|
*
|
|
|
|
* 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"
|
|
|
|
*/
|
2012-01-22 12:35:07 +00:00
|
|
|
string const parsecmd(string const & incmd, string & infile, string & outfile,
|
|
|
|
string & errfile)
|
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;
|
2011-10-28 11:51:48 +00:00
|
|
|
string const python_call = "python -tt";
|
2012-01-22 12:35:07 +00:00
|
|
|
vector<string> outcmd(4);
|
2011-10-31 02:02:27 +00:00
|
|
|
size_t start = 0;
|
2011-10-28 11:51:48 +00:00
|
|
|
|
2011-10-31 02:02:27 +00:00
|
|
|
if (prefixIs(incmd, python_call)) {
|
|
|
|
outcmd[0] = os::python();
|
2011-10-28 11:51:48 +00:00
|
|
|
start = python_call.length();
|
|
|
|
}
|
2009-12-19 17:26:09 +00:00
|
|
|
|
2011-10-31 02:02:27 +00:00
|
|
|
for (size_t i = start, o = 0; i < incmd.length(); ++i) {
|
|
|
|
char c = incmd[i];
|
2009-12-19 17:26:09 +00:00
|
|
|
if (c == '\'') {
|
|
|
|
if (in_double_quote || escaped) {
|
|
|
|
if (in_double_quote && escaped)
|
2011-10-31 02:02:27 +00:00
|
|
|
outcmd[o] += '\\';
|
|
|
|
outcmd[o] += c;
|
2009-12-19 17:26:09 +00:00
|
|
|
} else
|
|
|
|
in_single_quote = !in_single_quote;
|
|
|
|
escaped = false;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (in_single_quote) {
|
2011-10-31 02:02:27 +00:00
|
|
|
outcmd[o] += c;
|
2009-12-19 17:26:09 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (c == '"') {
|
|
|
|
if (escaped) {
|
2011-10-31 02:02:27 +00:00
|
|
|
// Don't triple double-quotes for redirection
|
|
|
|
// files as these won't be parsed by QProcess
|
|
|
|
outcmd[o] += string(o ? "\"" : "\"\"\"");
|
2009-12-19 17:26:09 +00:00
|
|
|
escaped = false;
|
|
|
|
} else {
|
2011-10-31 02:02:27 +00:00
|
|
|
outcmd[o] += c;
|
2009-12-19 17:26:09 +00:00
|
|
|
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)) {
|
2011-10-31 02:02:27 +00:00
|
|
|
if (suffixIs(outcmd[o], " 2")) {
|
|
|
|
outcmd[o] = rtrim(outcmd[o], "2");
|
|
|
|
o = 2;
|
|
|
|
} else {
|
|
|
|
if (suffixIs(outcmd[o], " 1"))
|
|
|
|
outcmd[o] = rtrim(outcmd[o], "1");
|
|
|
|
o = 1;
|
|
|
|
}
|
2012-01-22 12:35:07 +00:00
|
|
|
} else if (c == '<' && !(in_double_quote || escaped)) {
|
|
|
|
o = 3;
|
2009-12-19 17:26:09 +00:00
|
|
|
} else {
|
|
|
|
if (escaped && in_double_quote)
|
2011-10-31 02:02:27 +00:00
|
|
|
outcmd[o] += '\\';
|
|
|
|
outcmd[o] += 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
|
|
|
}
|
2012-01-22 12:35:07 +00:00
|
|
|
infile = trim(outcmd[3], " \"");
|
2011-10-31 02:02:27 +00:00
|
|
|
outfile = trim(outcmd[1], " \"");
|
|
|
|
errfile = trim(outcmd[2], " \"");
|
|
|
|
return trim(outcmd[0]);
|
2009-05-13 18:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
|
Introduce the possibility of setting a prefix for the TEXINPUTS environment
variable. This is done in the preferences, much like as the PATH prefix.
A single '.' in the paths will get replaced with the current document dir
and also non-absolute paths will be prefixed with that dir.
The default semantics of TEXINPUTS apply, such that, for example, if a
path is terminated with a double slash, all subdirectories will be also
searched by both the TeX engine and ancillary programs such as dvi
previewers or dvips. As an example, if the prefix is set to ".:figs", the
TEXINPUTS variable will be set as ".:<docdir>:<docdir>/figs:$ORIGTEXINPUTS",
where <docdir> is the document directory.
The initial '.' is necessary to address the actual current dir (this will
be the temp dir at preview time), while if TEXINPUTS was initially unset,
such that $ORIGTEXINPUTS is empty, a colon (or semicolon on Windows) will
end the path list. This is very important, because we don't want to replace
the system directories but to complement them and, in order to do that, an
empty element has to be present in the list. Indeed, according to the
TEXINPUTS semantics, an empty element means the standard search path.
This works whether TEXINPUTS is originally set or not, because if the
original TEXINPUTS starts with a colon (meaning that the standard search
path is wanted there) we will have an empty element at that point,
otherwise the final colon will simply serve as a path separator.
Of course, on Windows a ';' has to be used as a path separator. LyX will
take care of transforming the platform path list into one understandable
by the TeX engine. For example, this will be the case for a Cygwin version
of LyX using a native Windows TeX engine or viceversa. I tested all of
this and it works for me.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38681 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 23:25:51 +00:00
|
|
|
int Systemcall::startscript(Starttype how, string const & what,
|
|
|
|
string const & path, bool process_events)
|
2009-05-13 18:29:58 +00:00
|
|
|
{
|
2013-02-19 12:48:48 +00:00
|
|
|
LYXERR(Debug::INFO,"Running: " << what);
|
2011-10-31 02:02:27 +00:00
|
|
|
|
2012-01-22 12:35:07 +00:00
|
|
|
string infile;
|
2009-05-13 18:29:58 +00:00
|
|
|
string outfile;
|
2011-10-31 02:02:27 +00:00
|
|
|
string errfile;
|
2012-09-17 08:01:26 +00:00
|
|
|
QString const cmd = QString::fromLocal8Bit(
|
2012-01-22 12:35:07 +00:00
|
|
|
parsecmd(what, infile, outfile, errfile).c_str());
|
2009-12-18 12:20:22 +00:00
|
|
|
|
2012-01-22 12:35:07 +00:00
|
|
|
SystemcallPrivate d(infile, outfile, errfile);
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2014-03-18 21:32:57 +00:00
|
|
|
#ifdef Q_OS_WIN32
|
2014-03-19 20:07:43 +00:00
|
|
|
// QProcess::startDetached cannot provide environment variables. When the
|
|
|
|
// environment variables are set using the latexEnvCmdPrefix and the process
|
|
|
|
// is started with QProcess::startDetached, a console window is shown every
|
|
|
|
// time a viewer is started. To avoid this, we fall back on Windows to the
|
|
|
|
// original implementation that creates a QProcess object.
|
2014-03-18 21:32:57 +00:00
|
|
|
d.startProcess(cmd, path, false);
|
|
|
|
if (!d.waitWhile(SystemcallPrivate::Starting, process_events, -1)) {
|
|
|
|
LYXERR0("Systemcall: '" << cmd << "' did not start!");
|
|
|
|
LYXERR0("error " << d.errorMessage());
|
|
|
|
return 10;
|
|
|
|
}
|
|
|
|
if (how == DontWait) {
|
|
|
|
d.releaseProcess();
|
2013-07-16 04:39:28 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2014-03-18 21:32:57 +00:00
|
|
|
#else
|
|
|
|
d.startProcess(cmd, path, how == DontWait);
|
|
|
|
if (how == DontWait && d.state == SystemcallPrivate::Running)
|
|
|
|
return 0;
|
|
|
|
|
2013-07-16 04:39:28 +00:00
|
|
|
if (d.state == SystemcallPrivate::Error
|
|
|
|
|| !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;
|
|
|
|
}
|
2014-03-18 21:32:57 +00:00
|
|
|
#endif
|
2009-12-04 09:51:13 +00:00
|
|
|
|
2011-05-04 00:17:07 +00:00
|
|
|
if (!d.waitWhile(SystemcallPrivate::Running, process_events,
|
|
|
|
os::timeout_min() * 60 * 1000)) {
|
2010-11-01 20:24:29 +00:00
|
|
|
LYXERR0("Systemcall: '" << cmd << "' did not finish!");
|
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
|
|
|
|
|
|
|
|
2012-01-22 12:35:07 +00:00
|
|
|
SystemcallPrivate::SystemcallPrivate(std::string const & sf,
|
|
|
|
std::string const & of,
|
2011-10-31 02:02:27 +00:00
|
|
|
std::string const & ef) :
|
|
|
|
process_(new QProcess),
|
|
|
|
out_index_(0),
|
|
|
|
err_index_(0),
|
2012-01-22 12:35:07 +00:00
|
|
|
in_file_(sf),
|
2011-10-31 02:02:27 +00:00
|
|
|
out_file_(of),
|
|
|
|
err_file_(ef),
|
|
|
|
process_events_(false)
|
2009-05-14 15:13:58 +00:00
|
|
|
{
|
2012-01-22 12:35:07 +00:00
|
|
|
if (!in_file_.empty())
|
|
|
|
process_->setStandardInputFile(QString::fromLocal8Bit(in_file_.c_str()));
|
2010-07-16 08:09:38 +00:00
|
|
|
if (!out_file_.empty()) {
|
2011-10-31 02:02:27 +00:00
|
|
|
if (out_file_[0] == '&') {
|
|
|
|
if (subst(out_file_, " ", "") == "&2"
|
|
|
|
&& err_file_[0] != '&') {
|
|
|
|
out_file_ = err_file_;
|
|
|
|
process_->setProcessChannelMode(
|
|
|
|
QProcess::MergedChannels);
|
|
|
|
} else {
|
|
|
|
if (err_file_[0] == '&') {
|
|
|
|
// Leave alone things such as
|
|
|
|
// "1>&2 2>&1". Should not be harmful,
|
|
|
|
// but let's give anyway a warning.
|
|
|
|
LYXERR0("Unsupported stdout/stderr redirect.");
|
|
|
|
err_file_.erase();
|
|
|
|
} else {
|
|
|
|
LYXERR0("Ambiguous stdout redirect: "
|
|
|
|
<< out_file_);
|
|
|
|
}
|
|
|
|
out_file_ = os::nulldev();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Check whether we have to set the output file.
|
|
|
|
if (out_file_ != os::nulldev()) {
|
|
|
|
process_->setStandardOutputFile(QString::fromLocal8Bit(
|
|
|
|
out_file_.c_str()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!err_file_.empty()) {
|
|
|
|
if (err_file_[0] == '&') {
|
|
|
|
if (subst(err_file_, " ", "") == "&1"
|
|
|
|
&& out_file_[0] != '&') {
|
|
|
|
process_->setProcessChannelMode(
|
|
|
|
QProcess::MergedChannels);
|
|
|
|
} else {
|
|
|
|
LYXERR0("Ambiguous stderr redirect: "
|
|
|
|
<< err_file_);
|
|
|
|
}
|
|
|
|
// In MergedChannels mode stderr goes to stdout.
|
|
|
|
err_file_ = os::nulldev();
|
|
|
|
}
|
|
|
|
// Check whether we have to set the error file.
|
|
|
|
if (err_file_ != os::nulldev()) {
|
|
|
|
process_->setStandardErrorFile(QString::fromLocal8Bit(
|
|
|
|
err_file_.c_str()));
|
|
|
|
}
|
2010-07-16 05:55:31 +00:00
|
|
|
}
|
2009-12-04 10:11:06 +00:00
|
|
|
|
2010-07-16 06:08:12 +00:00
|
|
|
connect(process_, SIGNAL(readyReadStandardOutput()), SLOT(stdOut()));
|
|
|
|
connect(process_, SIGNAL(readyReadStandardError()), SLOT(stdErr()));
|
|
|
|
connect(process_, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
|
|
|
|
connect(process_, SIGNAL(started()), this, SLOT(processStarted()));
|
|
|
|
connect(process_, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
|
2009-12-04 09:51:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-07-16 04:39:28 +00:00
|
|
|
void SystemcallPrivate::startProcess(QString const & cmd, string const & path, bool detached)
|
2009-12-04 09:51:13 +00:00
|
|
|
{
|
2009-12-20 14:26:55 +00:00
|
|
|
cmd_ = cmd;
|
2013-07-16 04:39:28 +00:00
|
|
|
if (detached) {
|
|
|
|
state = SystemcallPrivate::Running;
|
|
|
|
if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path)) + cmd_)) {
|
|
|
|
state = SystemcallPrivate::Error;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
QProcess* released = releaseProcess();
|
|
|
|
delete released;
|
|
|
|
} else if (process_) {
|
2009-12-04 10:35:32 +00:00
|
|
|
state = SystemcallPrivate::Starting;
|
2011-09-25 13:35:42 +00:00
|
|
|
process_->start(toqstr(latexEnvCmdPrefix(path)) + 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()
|
|
|
|
{
|
2012-06-06 22:20:02 +00:00
|
|
|
if (process_events_) {
|
2009-12-20 14:27:19 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-18 14:16:25 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
bool queryStopCommand(QString const & cmd)
|
|
|
|
{
|
|
|
|
docstring text = bformat(_(
|
|
|
|
"The command\n%1$s\nhas not yet completed.\n\n"
|
|
|
|
"Do you want to stop it?"), qstring_to_ucs4(cmd));
|
|
|
|
return ProgressInterface::instance()->prompt(_("Stop command?"), text,
|
|
|
|
1, 1, _("&Stop it"), _("Let it &run")) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-16 06:08:12 +00:00
|
|
|
bool SystemcallPrivate::waitWhile(State waitwhile, bool process_events, int timeout)
|
2009-12-04 09:51:13 +00:00
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
if (!process_)
|
2009-12-04 10:35:32 +00:00
|
|
|
return false;
|
|
|
|
|
2012-02-18 14:16:25 +00:00
|
|
|
bool timedout = false;
|
2010-07-16 08:14:00 +00:00
|
|
|
process_events_ = process_events;
|
2009-12-04 11:08:24 +00:00
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
// Block GUI while waiting,
|
|
|
|
// relay on QProcess' wait functions
|
2010-07-16 08:14:00 +00:00
|
|
|
if (!process_events_) {
|
2009-12-04 09:51:13 +00:00
|
|
|
if (waitwhile == Starting)
|
2010-07-16 06:08:12 +00:00
|
|
|
return process_->waitForStarted(timeout);
|
2012-02-18 14:16:25 +00:00
|
|
|
if (waitwhile == Running) {
|
|
|
|
int bump = 2;
|
|
|
|
while (!timedout) {
|
|
|
|
if (process_->waitForFinished(timeout))
|
|
|
|
return true;
|
|
|
|
bool stop = queryStopCommand(cmd_);
|
|
|
|
// The command may have finished in the meantime
|
|
|
|
if (process_->state() == QProcess::NotRunning)
|
|
|
|
return true;
|
|
|
|
if (stop) {
|
|
|
|
timedout = true;
|
|
|
|
process_->kill();
|
|
|
|
} else {
|
|
|
|
timeout *= bump;
|
|
|
|
bump = 3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-12-04 09:51:13 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// process events while waiting, no timeout
|
|
|
|
if (timeout == -1) {
|
|
|
|
while (state == waitwhile && state != Error) {
|
|
|
|
waitAndProcessEvents();
|
|
|
|
}
|
|
|
|
return state != Error;
|
|
|
|
}
|
|
|
|
|
2012-09-12 23:38:26 +00:00
|
|
|
// process events while waiting with timeout
|
2009-12-04 09:51:13 +00:00
|
|
|
QTime timer;
|
|
|
|
timer.start();
|
2012-02-18 14:16:25 +00:00
|
|
|
while (state == waitwhile && state != Error && !timedout) {
|
2009-12-04 09:51:13 +00:00
|
|
|
waitAndProcessEvents();
|
2012-02-18 14:16:25 +00:00
|
|
|
if (timer.elapsed() > timeout) {
|
|
|
|
bool stop = queryStopCommand(cmd_);
|
|
|
|
// The command may have finished in the meantime
|
|
|
|
if (process_->state() == QProcess::NotRunning)
|
|
|
|
break;
|
|
|
|
if (stop) {
|
|
|
|
timedout = true;
|
|
|
|
process_->kill();
|
|
|
|
} else
|
|
|
|
timeout *= 3;
|
|
|
|
}
|
2009-12-04 09:51:13 +00:00
|
|
|
}
|
2012-02-18 14:16:25 +00:00
|
|
|
return (state != Error) && !timedout;
|
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
|
|
|
{
|
2010-07-16 08:09:38 +00:00
|
|
|
if (out_index_) {
|
|
|
|
out_data_[out_index_] = '\0';
|
|
|
|
out_index_ = 0;
|
2010-07-16 14:30:46 +00:00
|
|
|
cout << out_data_;
|
2009-05-15 09:20:59 +00:00
|
|
|
}
|
2009-05-14 15:13:58 +00:00
|
|
|
cout.flush();
|
2010-07-16 08:09:38 +00:00
|
|
|
if (err_index_) {
|
|
|
|
err_data_[err_index_] = '\0';
|
|
|
|
err_index_ = 0;
|
2010-07-16 14:30:46 +00:00
|
|
|
cerr << err_data_;
|
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 09:51:13 +00:00
|
|
|
void SystemcallPrivate::stdOut()
|
2009-05-14 15:13:58 +00:00
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
if (process_) {
|
2009-05-14 15:13:58 +00:00
|
|
|
char c;
|
2010-07-16 06:08:12 +00:00
|
|
|
process_->setReadChannel(QProcess::StandardOutput);
|
|
|
|
while (process_->getChar(&c)) {
|
2010-07-16 08:09:38 +00:00
|
|
|
out_data_[out_index_++] = c;
|
2010-07-16 14:30:46 +00:00
|
|
|
if (c == '\n' || out_index_ + 1 == buffer_size_) {
|
2010-07-16 08:09:38 +00:00
|
|
|
out_data_[out_index_] = '\0';
|
|
|
|
out_index_ = 0;
|
|
|
|
ProgressInterface::instance()->appendMessage(QString::fromLocal8Bit(out_data_));
|
2010-07-16 14:30:46 +00:00
|
|
|
cout << out_data_;
|
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
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
if (process_) {
|
2009-05-14 15:13:58 +00:00
|
|
|
char c;
|
2010-07-16 06:08:12 +00:00
|
|
|
process_->setReadChannel(QProcess::StandardError);
|
|
|
|
while (process_->getChar(&c)) {
|
2010-07-16 08:09:38 +00:00
|
|
|
err_data_[err_index_++] = c;
|
2010-07-16 14:30:46 +00:00
|
|
|
if (c == '\n' || err_index_ + 1 == buffer_size_) {
|
2010-07-16 08:09:38 +00:00
|
|
|
err_data_[err_index_] = '\0';
|
|
|
|
err_index_ = 0;
|
|
|
|
ProgressInterface::instance()->appendError(QString::fromLocal8Bit(err_data_));
|
2010-07-16 14:30:46 +00:00
|
|
|
cerr << err_data_;
|
2009-05-14 15:13:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-12-04 11:08:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SystemcallPrivate::processStarted()
|
|
|
|
{
|
2009-12-26 16:07:16 +00:00
|
|
|
if (state != Running) {
|
2009-12-26 17:14:53 +00:00
|
|
|
state = Running;
|
|
|
|
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
|
|
|
{
|
2009-12-26 16:53:29 +00:00
|
|
|
if (state != Finished) {
|
|
|
|
state = Finished;
|
|
|
|
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
|
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
if (!process_)
|
2009-12-04 10:35:32 +00:00
|
|
|
return "No QProcess available";
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
QString message;
|
2010-07-16 06:08:12 +00:00
|
|
|
switch (process_->error()) {
|
2009-12-04 09:51:13 +00:00
|
|
|
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
|
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
if (!process_)
|
2009-12-04 10:35:32 +00:00
|
|
|
return "No QProcess available";
|
|
|
|
|
2009-12-04 09:51:13 +00:00
|
|
|
QString message;
|
2010-07-16 06:08:12 +00:00
|
|
|
switch (process_->exitStatus()) {
|
2009-12-04 09:51:13 +00:00
|
|
|
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()
|
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
if (!process_)
|
2009-12-04 10:35:32 +00:00
|
|
|
return -1;
|
|
|
|
|
2010-07-16 06:08:12 +00:00
|
|
|
return process_->exitCode();
|
2009-12-04 10:11:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 10:35:32 +00:00
|
|
|
QProcess* SystemcallPrivate::releaseProcess()
|
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
QProcess* released = process_;
|
|
|
|
process_ = 0;
|
2009-12-04 10:35:32 +00:00
|
|
|
return released;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-04 10:11:06 +00:00
|
|
|
void SystemcallPrivate::killProcess()
|
|
|
|
{
|
2010-07-16 06:08:12 +00:00
|
|
|
killProcess(process_);
|
2009-12-04 10:11:06 +00:00
|
|
|
}
|
|
|
|
|
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
|