X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fexecwrapper.cpp;h=510a4444d36564a63afd59c46aeaa9bd62e6326b;hp=24b5c8429dd20eaf41b0e6bc9e839246f2f86498;hb=faffcce49db14f404dc6446a76ecaf056f9eb481;hpb=127d1fd9e75d33f1a6a4cd4d30c259b00686c4ff

diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
index 24b5c842..510a4444 100644
--- a/src/client/execwrapper.cpp
+++ b/src/client/execwrapper.cpp
@@ -32,8 +32,8 @@ ExecWrapper::ExecWrapper(QObject* parent) : QObject(parent) {
   connect(&_process, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)));
   connect(&_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
 
-  connect(this, SIGNAL(stdout(QString)), SLOT(postStdout(QString)));
-  connect(this, SIGNAL(stderr(QString)), SLOT(postStderr(QString)));
+  connect(this, SIGNAL(output(QString)), SLOT(postStdout(QString)));
+  connect(this, SIGNAL(error(QString)), SLOT(postStderr(QString)));
 }
 
 void ExecWrapper::start(const BufferInfo &info, const QString &command) {
@@ -42,25 +42,26 @@ void ExecWrapper::start(const BufferInfo &info, const QString &command) {
 
   QRegExp rx("^\\s*(\\S+)(\\s+(.*))?$");
   if(!rx.exactMatch(command)) {
-    emit stderr(tr("Invalid command string for /exec: %1").arg(command));
+    emit error(tr("Invalid command string for /exec: %1").arg(command));
   } else {
     _scriptName = rx.cap(1);
     params = rx.cap(3);
   }
 
   // Make sure we don't execute something outside a script dir
-  if(_scriptName.startsWith('/') || _scriptName.contains("../"))
-    emit stderr(tr("Name \"%1\" is invalid: / or ../ are not allowed!").arg(_scriptName));
+  if(_scriptName.contains("../") || _scriptName.contains("..\\"))
+    emit error(tr("Name \"%1\" is invalid: ../ or ..\\ are not allowed!").arg(_scriptName));
 
   else {
     foreach(QString scriptDir, Quassel::scriptDirPaths()) {
       QString fileName = scriptDir + _scriptName;
       if(!QFile::exists(fileName))
         continue;
-      _process.start(fileName + ' ' + params);
+      _process.setWorkingDirectory(scriptDir);
+      _process.start('"' + fileName + "\" " + params);
       return;
     }
-    emit stderr(tr("Could not find script \"%1\"").arg(_scriptName));
+    emit error(tr("Could not find script \"%1\"").arg(_scriptName));
   }
 
   deleteLater(); // self-destruct
@@ -78,40 +79,48 @@ void ExecWrapper::postStderr(const QString &msg) {
 
 void ExecWrapper::processFinished(int exitCode, QProcess::ExitStatus status) {
   if(status == QProcess::CrashExit) {
-    emit stderr(tr("Script \"%1\" crashed with exit code %2.").arg(_scriptName).arg(exitCode));
+    emit error(tr("Script \"%1\" crashed with exit code %2.").arg(_scriptName).arg(exitCode));
   }
 
   // empty buffers
   if(!_stdoutBuffer.isEmpty())
     foreach(QString msg, _stdoutBuffer.split('\n'))
-      emit stdout(msg);
+      emit output(msg);
   if(!_stderrBuffer.isEmpty())
     foreach(QString msg, _stderrBuffer.split('\n'))
-    emit stderr(msg);
+    emit error(msg);
 
   deleteLater();
 }
 
-void ExecWrapper::processError(QProcess::ProcessError error) {
-  emit stderr(tr("Script \"%1\" caused error %2.").arg(_scriptName).arg(error));
+void ExecWrapper::processError(QProcess::ProcessError err) {
+  if(err == QProcess::FailedToStart)
+    emit error(tr("Script \"%1\" could not start.").arg(_scriptName));
+  else
+    emit error(tr("Script \"%1\" caused error %2.").arg(_scriptName).arg(err));
+
   if(_process.state() != QProcess::Running)
     deleteLater();
 }
 
 void ExecWrapper::processReadStdout() {
-  _stdoutBuffer.append(_process.readAllStandardOutput());
+  QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardOutput());
+  str.replace(QRegExp("\r\n?"), "\n");
+  _stdoutBuffer.append(str);
   int idx;
   while((idx = _stdoutBuffer.indexOf('\n')) >= 0) {
-    emit stdout(_stdoutBuffer.left(idx));
+    emit output(_stdoutBuffer.left(idx));
     _stdoutBuffer = _stdoutBuffer.mid(idx + 1);
   }
 }
 
 void ExecWrapper::processReadStderr() {
-  _stderrBuffer.append(_process.readAllStandardError());
+  QString str = QTextCodec::codecForLocale()->toUnicode(_process.readAllStandardError());
+  str.replace(QRegExp("\r\n?"), "\n");
+  _stderrBuffer.append(str);
   int idx;
   while((idx = _stderrBuffer.indexOf('\n')) >= 0) {
-    emit stderr(_stderrBuffer.left(idx));
+    emit error(_stderrBuffer.left(idx));
     _stderrBuffer = _stderrBuffer.mid(idx + 1);
   }
 }