diff options
| author | Tobias Nätterlund <tobias.naetterlund.qnx@kdab.com> | 2013-10-18 15:49:23 +0200 |
|---|---|---|
| committer | Tobias Nätterlund <tobias.naetterlund@kdab.com> | 2013-10-21 10:02:36 +0200 |
| commit | 295c68846955efd4ba0c02ac3e8b6d72a07da157 (patch) | |
| tree | b7022ac56fc6930583045cca651acff498be7d0f /src | |
| parent | 34ef3f244e1e17fc68e625f4626d0377bd878e7f (diff) | |
QNX: Fixed killing processes on QNX and BlackBerry
The commands were mixed up in previous commit, we have to use
pidin on BlackBerry, at least the older ones.
Change-Id: Ibff1f386c6570814a4bccfef5404e60854222f24
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qnx/qnxdeviceprocesssignaloperation.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qnx/qnxdeviceprocesssignaloperation.cpp b/src/plugins/qnx/qnxdeviceprocesssignaloperation.cpp index 003d60e020..64353babdf 100644 --- a/src/plugins/qnx/qnxdeviceprocesssignaloperation.cpp +++ b/src/plugins/qnx/qnxdeviceprocesssignaloperation.cpp @@ -40,10 +40,10 @@ QnxDeviceProcessSignalOperation::QnxDeviceProcessSignalOperation( { } -static QString signalProcessByNameBlackBerryCommandLine(const QString &filePath, int sig) +static QString signalProcessByNameQnxCommandLine(const QString &filePath, int sig) { QString executable = filePath; - return QString::fromLatin1("for PID in $(pidin -F \"%a %A\" | grep \"%1\" | awk '/%1/ {print $1}'); " + return QString::fromLatin1("for PID in $(ps -f -o pid,comm | grep %1 | awk '/%1/ {print $1}'); " "do " "kill -%2 $PID; " "done").arg(executable.replace(QLatin1String("/"), QLatin1String("\\/"))).arg(sig); @@ -52,14 +52,14 @@ static QString signalProcessByNameBlackBerryCommandLine(const QString &filePath, QString QnxDeviceProcessSignalOperation::killProcessByNameCommandLine( const QString &filePath) const { - return QString::fromLatin1("%1; %2").arg(signalProcessByNameBlackBerryCommandLine(filePath, 15), - signalProcessByNameBlackBerryCommandLine(filePath, 9)); + return QString::fromLatin1("%1; %2").arg(signalProcessByNameQnxCommandLine(filePath, 15), + signalProcessByNameQnxCommandLine(filePath, 9)); } QString QnxDeviceProcessSignalOperation::interruptProcessByNameCommandLine( const QString &filePath) const { - return signalProcessByNameBlackBerryCommandLine(filePath, 2); + return signalProcessByNameQnxCommandLine(filePath, 2); } @@ -69,10 +69,10 @@ BlackBerryDeviceProcessSignalOperation::BlackBerryDeviceProcessSignalOperation( { } -static QString signalProcessByNameQnxCommandLine(const QString &filePath, int sig) +static QString signalProcessByNameBlackBerryCommandLine(const QString &filePath, int sig) { QString executable = filePath; - return QString::fromLatin1("for PID in $(ps -f -o pid,comm | grep %1 | awk '/%1/ {print $1}'); " + return QString::fromLatin1("for PID in $(pidin -F \"%a %A\" | grep \"%1\" | awk '/%1/ {print $1}'); " "do " "kill -%2 $PID; " "done").arg(executable.replace(QLatin1String("/"), QLatin1String("\\/"))).arg(sig); @@ -80,11 +80,11 @@ static QString signalProcessByNameQnxCommandLine(const QString &filePath, int si QString BlackBerryDeviceProcessSignalOperation::killProcessByNameCommandLine(const QString &filePath) const { - return QString::fromLatin1("%1; %2").arg(signalProcessByNameQnxCommandLine(filePath, 15), - signalProcessByNameQnxCommandLine(filePath, 9)); + return QString::fromLatin1("%1; %2").arg(signalProcessByNameBlackBerryCommandLine(filePath, 15), + signalProcessByNameBlackBerryCommandLine(filePath, 9)); } QString BlackBerryDeviceProcessSignalOperation::interruptProcessByNameCommandLine(const QString &filePath) const { - return signalProcessByNameQnxCommandLine(filePath, 2); + return signalProcessByNameBlackBerryCommandLine(filePath, 2); } |