anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup process output

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32656 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2009-12-27 10:53:28 +00:00
parent 74d47d843e
commit 99116c8d64
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/support/Systemcall.cpp
View File

@ -32,7 +32,7 @@
#include <QDebug> #include <QDebug>
#define USE_QPROCESS #define USE_QPROCESS
#define DEBUG_SYSTEMCALL //#define DEBUG_SYSTEMCALL // this macro shows the Qt 4.5 & 4.6 bug on Linux: multiple started() signals
struct Sleep : QThread struct Sleep : QThread
{ {
@ -348,12 +348,19 @@ void SystemcallPrivate::flush()
// If the output has been redirected, we write it all at once. // 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 // Even if we are not running in a terminal, the output could go
// to some log file, for example ~/.xsession-errors on *nix. // to some log file, for example ~/.xsession-errors on *nix.
QString data = QString::fromLocal8Bit(proc_->readAllStandardOutput().data());
if (showout_)
ProgressInterface::instance()->appendMessage(data);
if (!os::is_terminal(os::STDOUT) && outfile.empty()) if (!os::is_terminal(os::STDOUT) && outfile.empty())
cout << fromqstr(QString::fromLocal8Bit( cout << fromqstr(data);
proc_->readAllStandardOutput().data()));
data = QString::fromLocal8Bit(proc_->readAllStandardError().data());
if (showerr_)
ProgressInterface::instance()->appendError(data);
if (!os::is_terminal(os::STDERR)) if (!os::is_terminal(os::STDERR))
cerr << fromqstr(QString::fromLocal8Bit( cerr << fromqstr(data);
proc_->readAllStandardError().data()));
} }
} }
@ -368,17 +375,13 @@ void SystemcallPrivate::stdOut()
if (c == '\n' || outindex_ + 1 == bufsize_) { if (c == '\n' || outindex_ + 1 == bufsize_) {
outdata_[outindex_] = '\0'; outdata_[outindex_] = '\0';
outindex_ = 0; outindex_ = 0;
if (showout_) if (showout_) {
cout << outdata_; cout << outdata_;
ProgressInterface::instance()->appendMessage(QString::fromLocal8Bit(outdata_));
}
} }
} }
} }
const QString data = QString::fromLocal8Bit(outdata_);
if (!data.isEmpty()) {
// TODO No good messages from the processes. Disable batch mode?
//ProgressInterface::instance()->appendMessage(data);
}
processEvents();
} }
@ -392,16 +395,13 @@ void SystemcallPrivate::stdErr()
if (c == '\n' || errindex_ + 1 == bufsize_) { if (c == '\n' || errindex_ + 1 == bufsize_) {
errdata_[errindex_] = '\0'; errdata_[errindex_] = '\0';
errindex_ = 0; errindex_ = 0;
if (showerr_) if (showerr_) {
cerr << errdata_; cerr << errdata_;
ProgressInterface::instance()->appendError(QString::fromLocal8Bit(errdata_));
}
} }
} }
} }
const QString data = QString::fromLocal8Bit(errdata_);
if (!data.isEmpty()) {
ProgressInterface::instance()->appendError(data);
}
processEvents();
} }