anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix converters with input redirection, such as the second htlatex one.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40647 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2012-01-22 12:35:07 +00:00
parent 0293746521
commit 29627f1680
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/support/Systemcall.cpp
View File

@ -130,8 +130,7 @@ namespace {
/* /*
* This is a parser that (mostly) mimics the behavior of a posix shell as * 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. * regards quoting, but its output is tailored for being processed by QProcess.
* Note that shell metacharacters are not parsed and only output redirection * Note that shell metacharacters are not parsed.
* is taken into account.
* *
* The escape character is the backslash. * The escape character is the backslash.
* A backslash that is not quoted preserves the literal value of the following * A backslash that is not quoted preserves the literal value of the following
@ -164,13 +163,14 @@ namespace {
* "\a" -> "\a" * "\a" -> "\a"
* "a\"b" -> "a"""b" * "a\"b" -> "a"""b"
*/ */
string const parsecmd(string const & incmd, string & outfile, string & errfile) string const parsecmd(string const & incmd, string & infile, string & outfile,
string & errfile)
{ {
bool in_single_quote = false; bool in_single_quote = false;
bool in_double_quote = false; bool in_double_quote = false;
bool escaped = false; bool escaped = false;
string const python_call = "python -tt"; string const python_call = "python -tt";
vector<string> outcmd(3); vector<string> outcmd(4);
size_t start = 0; size_t start = 0;
if (prefixIs(incmd, python_call)) { if (prefixIs(incmd, python_call)) {
@ -215,6 +215,8 @@ string const parsecmd(string const & incmd, string & outfile, string & errfile)
outcmd[o] = rtrim(outcmd[o], "1"); outcmd[o] = rtrim(outcmd[o], "1");
o = 1; o = 1;
} }
} else if (c == '<' && !(in_double_quote || escaped)) {
o = 3;
} else { } else {
if (escaped && in_double_quote) if (escaped && in_double_quote)
outcmd[o] += '\\'; outcmd[o] += '\\';
@ -222,6 +224,7 @@ string const parsecmd(string const & incmd, string & outfile, string & errfile)
escaped = false; escaped = false;
} }
} }
infile = trim(outcmd[3], " \"");
outfile = trim(outcmd[1], " \""); outfile = trim(outcmd[1], " \"");
errfile = trim(outcmd[2], " \""); errfile = trim(outcmd[2], " \"");
return trim(outcmd[0]); return trim(outcmd[0]);
@ -236,12 +239,13 @@ int Systemcall::startscript(Starttype how, string const & what,
{ {
lyxerr << "\nRunning: " << what << endl; lyxerr << "\nRunning: " << what << endl;
string infile;
string outfile; string outfile;
string errfile; string errfile;
QString cmd = QString::fromLocal8Bit( QString cmd = QString::fromLocal8Bit(
parsecmd(what, outfile, errfile).c_str()); parsecmd(what, infile, outfile, errfile).c_str());
SystemcallPrivate d(outfile, errfile); SystemcallPrivate d(infile, outfile, errfile);
d.startProcess(cmd, path); d.startProcess(cmd, path);
@ -274,15 +278,19 @@ int Systemcall::startscript(Starttype how, string const & what,
} }
SystemcallPrivate::SystemcallPrivate(std::string const & of, SystemcallPrivate::SystemcallPrivate(std::string const & sf,
std::string const & of,
std::string const & ef) : std::string const & ef) :
process_(new QProcess), process_(new QProcess),
out_index_(0), out_index_(0),
err_index_(0), err_index_(0),
in_file_(sf),
out_file_(of), out_file_(of),
err_file_(ef), err_file_(ef),
process_events_(false) process_events_(false)
{ {
if (!in_file_.empty())
process_->setStandardInputFile(QString::fromLocal8Bit(in_file_.c_str()));
if (!out_file_.empty()) { if (!out_file_.empty()) {
if (out_file_[0] == '&') { if (out_file_[0] == '&') {
if (subst(out_file_, " ", "") == "&2" if (subst(out_file_, " ", "") == "&2"

5
src/support/SystemcallPrivate.h
View File

@ -32,7 +32,8 @@ class SystemcallPrivate : public QObject
Q_OBJECT Q_OBJECT
public: public:
SystemcallPrivate(std::string const & outfile, std::string const & errfile); SystemcallPrivate(std::string const & infile, std::string const & outfile,
std::string const & errfile);
~SystemcallPrivate(); ~SystemcallPrivate();
enum State { enum State {
@ -73,6 +74,8 @@ private:
/// Index to the standard error buffer. /// Index to the standard error buffer.
size_t err_index_; size_t err_index_;
/// ///
std::string in_file_;
///
std::string out_file_; std::string out_file_;
/// ///
std::string err_file_; std::string err_file_;