Various fixes suggested by cppcheck

[features.git] / src / support / Systemcall.cpp

diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index e658f915d4db76e818c60bd57429037a8b0e1ea3..a270b4118dbfc59584518317b37bc948b525e7c3 100644 (file)
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -205,7 +205,7 @@ string const parsecmd(string const & incmd, string & infile, string & outfile,
                                in_double_quote = !in_double_quote;
                        }
                } else if (c == '\\' && !escaped) {
-                       escaped = !escaped;
+                       escaped = true;
                } else if (c == '>' && !(in_double_quote || escaped)) {
                        if (suffixIs(outcmd[o], " 2")) {
                                outcmd[o] = rtrim(outcmd[o], "2");
@@ -258,28 +258,6 @@ int Systemcall::startscript(Starttype how, string const & what,
        SystemcallPrivate d(infile, outfile, errfile);
        bool do_events = process_events || how == WaitLoop;
 
-#ifdef Q_OS_WIN32
-       // 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.
-       d.startProcess(cmd, path, lpath, false);
-       if (!d.waitWhile(SystemcallPrivate::Starting, do_events, -1)) {
-               if (d.state == SystemcallPrivate::Error) {
-                       LYXERR0("Systemcall: '" << cmd << "' did not start!");
-                       LYXERR0("error " << d.errorMessage());
-                       return NOSTART;
-               } else if (d.state == SystemcallPrivate::Killed) {
-                       LYXERR0("Killed: " << cmd);
-                       return KILLED;
-               }
-       }
-       if (how == DontWait) {
-               d.releaseProcess();
-               return OK;
-       }
-#else
        d.startProcess(cmd, path, lpath, how == DontWait);
        if (how == DontWait && d.state == SystemcallPrivate::Running)
                return OK;
@@ -295,7 +273,6 @@ int Systemcall::startscript(Starttype how, string const & what,
                        return KILLED;
                }
        }
-#endif
 
        if (!d.waitWhile(SystemcallPrivate::Running, do_events,
                         os::timeout_min() * 60 * 1000)) {
@@ -393,6 +370,15 @@ void SystemcallPrivate::startProcess(QString const & cmd, string const & path,
        cmd_ = cmd;
        if (detached) {
                state = SystemcallPrivate::Running;
+#ifdef Q_OS_WIN32
+               // Avoid opening a console window when a viewer is started
+               if (in_file_.empty())
+                       process_->setStandardInputFile(QProcess::nullDevice());
+               if (out_file_.empty())
+                       process_->setStandardOutputFile(QProcess::nullDevice());
+               if (err_file_.empty())
+                       process_->setStandardErrorFile(QProcess::nullDevice());
+#endif
                if (!QProcess::startDetached(toqstr(latexEnvCmdPrefix(path, lpath)) + cmd_)) {
                        state = SystemcallPrivate::Error;
                        return;