also delete process on errors, use RAII therefore

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32325 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 054be5f949e529cec1c8c667eeb8e427e46f91be..abb96bc9e54833ab8ca8ab8f68e8c7678831e635 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -115,7 +115,8 @@ int Systemcall::startscript(Starttype how, string const & what)
        }
 
        if (how == DontWait) {
-               // TODO delete process later
+               QProcess* released = d.releaseProcess();
+               (void) released; // TODO who deletes it?
                return 0;
        }
 
@@ -132,9 +133,6 @@ int Systemcall::startscript(Starttype how, string const & what)
                LYXERR0("error " << exit_code << ": " << d.errorMessage()); 
        }
 
-       d.flush();
-       d.killProcess();
-
        return exit_code;
 }
 
@@ -163,8 +161,10 @@ SystemcallPrivate::SystemcallPrivate(const std::string& of) :
 
 void SystemcallPrivate::startProcess(const QString& cmd)
 {
-       state = SystemcallPrivate::Starting;
-       proc_->start(cmd);
+       if (proc_) {
+               state = SystemcallPrivate::Starting;
+               proc_->start(cmd);
+       }
 }
 
 
@@ -177,6 +177,9 @@ void SystemcallPrivate::waitAndProcessEvents()
 
 bool SystemcallPrivate::waitWhile(State waitwhile, bool processEvents, int timeout)
 {
+       if (!proc_)
+               return false;
+
        // Block GUI while waiting,
        // relay on QProcess' wait functions
        if (!processEvents) {
@@ -208,6 +211,8 @@ bool SystemcallPrivate::waitWhile(State waitwhile, bool processEvents, int timeo
 
 SystemcallPrivate::~SystemcallPrivate()
 {
+       flush();
+
        if (outindex_) {
                outdata_[outindex_] = '\0';
                outindex_ = 0;
@@ -220,25 +225,29 @@ SystemcallPrivate::~SystemcallPrivate()
                cerr << errdata_;
        }
        cerr.flush();
+
+       killProcess();
 }
 
 
 void SystemcallPrivate::flush()
 {
-       // 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()));
+       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()));
+       }
 }
 
 void SystemcallPrivate::stdOut()
 {
-       if (showout_) {
+       if (proc_ && showout_) {
                char c;
                proc_->setReadChannel(QProcess::StandardOutput);
                while (proc_->getChar(&c)) {
@@ -255,7 +264,7 @@ void SystemcallPrivate::stdOut()
 
 void SystemcallPrivate::stdErr()
 {
-       if (showerr_) {
+       if (proc_ && showerr_) {
                char c;
                proc_->setReadChannel(QProcess::StandardError);
                while (proc_->getChar(&c)) {
@@ -278,6 +287,9 @@ void SystemcallPrivate::processError(QProcess::ProcessError err)
 
 QString SystemcallPrivate::errorMessage() const 
 {
+       if (!proc_)
+               return "No QProcess available";
+
        QString message;
        switch (proc_->error()) {
                case QProcess::FailedToStart:
@@ -323,6 +335,9 @@ void SystemcallPrivate::processFinished(int, QProcess::ExitStatus status)
 
 QString SystemcallPrivate::exitStatusMessage() const
 {
+       if (!proc_)
+               return "No QProcess available";
+
        QString message;
        switch (proc_->exitStatus()) {
                case QProcess::NormalExit:
@@ -340,10 +355,21 @@ QString SystemcallPrivate::exitStatusMessage() const
 
 int SystemcallPrivate::exitCode()
 {
+       if (!proc_)
+               return -1;
+
        return proc_->exitCode();
 }
 
 
+QProcess* SystemcallPrivate::releaseProcess()
+{
+       QProcess* released = proc_;
+       proc_ = 0;
+       return released;
+}
+
+
 void SystemcallPrivate::killProcess()
 {
        killProcess(proc_);
@@ -351,11 +377,13 @@ void SystemcallPrivate::killProcess()
 
 void SystemcallPrivate::killProcess(QProcess * p)
 {
-       p->disconnect();
-       p->closeReadChannel(QProcess::StandardOutput);
-       p->closeReadChannel(QProcess::StandardError);
-       p->close();
-       delete p;
+       if (p) {
+               p->disconnect();
+               p->closeReadChannel(QProcess::StandardOutput);
+               p->closeReadChannel(QProcess::StandardError);
+               p->close();
+               delete p;
+       }
 }
 
 

diff --git a/src/support/SystemcallPrivate.h b/src/support/SystemcallPrivate.h
index a7c25639006c4a5317c8d1a4a9b17e4d9b4c5f54..ff4afed0ea88419bb2f2d8505b62b624c4776aff 100644 (file)
--- a/src/support/SystemcallPrivate.h
+++ b/src/support/SystemcallPrivate.h
@@ -56,7 +56,9 @@ public:
        QString exitStatusMessage() const;
 
        void flush();
-       void killProcess();
+
+       QProcess* releaseProcess();
+       
        static void killProcess(QProcess * p);
 
 private:
@@ -81,6 +83,8 @@ private:
 
        void waitAndProcessEvents();
 
+       void killProcess();
+
 public Q_SLOTS:
        void stdOut();
        void stdErr();