X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fexecwrapper.cpp;h=7eac35211e62ba3e2136eb290f74ce52fe66a7c9;hp=f87eb0c7ede7dd35a90cd44ad0a1bea32b91736d;hb=6c561d2b7b1bb303cfcd8a013179b1838d315910;hpb=cc6e7c08709c4e761e2fd9c2e322751015497003

diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
index f87eb0c7..7eac3521 100644
--- a/src/client/execwrapper.cpp
+++ b/src/client/execwrapper.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,6 +22,7 @@
 
 #include <QFile>
 #include <QTextCodec>
+#include <QRegularExpression>
 
 #include "client.h"
 #include "messagemodel.h"
@@ -34,7 +35,11 @@ ExecWrapper::ExecWrapper(QObject* parent)
     connect(&_process, &QProcess::readyReadStandardOutput, this, &ExecWrapper::processReadStdout);
     connect(&_process, &QProcess::readyReadStandardError, this, &ExecWrapper::processReadStderr);
     connect(&_process, selectOverload<int, QProcess::ExitStatus>(&QProcess::finished), this, &ExecWrapper::processFinished);
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
     connect(&_process, selectOverload<QProcess::ProcessError>(&QProcess::error), this, &ExecWrapper::processError);
+#else
+    connect(&_process, &QProcess::errorOccurred, this, &ExecWrapper::processError);
+#endif
 
     connect(this, &ExecWrapper::output, this, &ExecWrapper::postStdout);
     connect(this, &ExecWrapper::error, this, &ExecWrapper::postStderr);
@@ -43,28 +48,32 @@ ExecWrapper::ExecWrapper(QObject* parent)
 void ExecWrapper::start(const BufferInfo& info, const QString& command)
 {
     _bufferInfo = info;
-    QString params;
+    _scriptName.clear();
 
-    QRegExp rx(R"(^\s*(\S+)(\s+(.*))?$)");
-    if (!rx.exactMatch(command)) {
+    QStringList params;
+
+    static const QRegularExpression rx{R"(^\s*(\S+)(\s+(.*))?$)"};
+    auto match = rx.match(command);
+    if (!match.hasMatch()) {
         emit error(tr("Invalid command string for /exec: %1").arg(command));
     }
     else {
-        _scriptName = rx.cap(1);
-        params = rx.cap(3);
+        _scriptName = match.captured(1);
+        static const QRegularExpression splitRx{"\\s+"};
+        params = match.captured(3).split(splitRx, QString::SkipEmptyParts);
     }
 
     // Make sure we don't execute something outside a script dir
-    if (_scriptName.contains("../") || _scriptName.contains("..\\"))
+    if (_scriptName.contains("../") || _scriptName.contains("..\\")) {
         emit error(tr(R"(Name "%1" is invalid: ../ or ..\ are not allowed!)").arg(_scriptName));
-
-    else {
+    }
+    else if (!_scriptName.isEmpty()) {
         foreach (QString scriptDir, Quassel::scriptDirPaths()) {
             QString fileName = scriptDir + _scriptName;
             if (!QFile::exists(fileName))
                 continue;
             _process.setWorkingDirectory(scriptDir);
-            _process.start('"' + fileName + "\" " + params);
+            _process.start(_scriptName, params);
             return;
         }
         emit error(tr("Could not find script \"%1\"").arg(_scriptName));