forked from pool/kde-cli-tools5
c6abb9d535
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-cli-tools5?expand=0&rev=192
77 lines
3.0 KiB
Diff
77 lines
3.0 KiB
Diff
From abee9c239f74f60a77c0931be23ad1d8670feda6 Mon Sep 17 00:00:00 2001
|
|
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
|
|
Date: Tue, 3 Dec 2013 19:31:13 +0100
|
|
Subject: [PATCH 1/1] kdesu Add some love
|
|
|
|
From/toUTF8 in practice covers more ground than 8bit.
|
|
Furthermore, make the kdesu 'command' translatable, it's used
|
|
in openSUSE with dolphin and konsole 'Start as root'
|
|
BUG: boo#852256
|
|
---
|
|
kdesu/kdesu.cpp | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
Index: kde-cli-tools-5.12.80git.20180210T155619~a94e055/kdesu/kdesu.cpp
|
|
===================================================================
|
|
--- kde-cli-tools-5.12.80git.20180210T155619~a94e055.orig/kdesu/kdesu.cpp
|
|
+++ kde-cli-tools-5.12.80git.20180210T155619~a94e055/kdesu/kdesu.cpp
|
|
@@ -160,11 +160,11 @@ int main(int argc, char *argv[])
|
|
|
|
if (result == 127)
|
|
{
|
|
- KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command)));
|
|
+ KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'.", QString::fromUtf8(command)));
|
|
}
|
|
if (result == -2)
|
|
{
|
|
- KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command)));
|
|
+ KMessageBox::sorry(nullptr, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromUtf8(command)));
|
|
}
|
|
|
|
return result;
|
|
@@ -199,7 +199,7 @@ static int startApp(QCommandLineParser&
|
|
prompt = false;
|
|
|
|
// Get target uid
|
|
- QByteArray user = p.value("u").toLocal8Bit();
|
|
+ QByteArray user = p.value("u").toUtf8();
|
|
QByteArray auth_user = user;
|
|
struct passwd *pw = getpwnam(user);
|
|
if (pw == nullptr)
|
|
@@ -259,7 +259,7 @@ static int startApp(QCommandLineParser&
|
|
// Get command
|
|
if (p.isSet("c"))
|
|
{
|
|
- command = p.value("c").toLocal8Bit();
|
|
+ command = p.value("c").toUtf8();
|
|
// Accepting additional arguments here is somewhat weird,
|
|
// but one can conceive use cases: have a complex command with
|
|
// redirections and additional file names which need to be quoted
|
|
@@ -347,7 +347,7 @@ static int startApp(QCommandLineParser&
|
|
// }
|
|
|
|
KUser u;
|
|
- env << (QByteArray) ("KDESU_USER=" + u.loginName().toLocal8Bit());
|
|
+ env << (QByteArray) ("KDESU_USER=" + u.loginName().toUtf8());
|
|
|
|
if (keep && !terminal && !just_started)
|
|
{
|
|
@@ -459,7 +459,7 @@ static int startApp(QCommandLineParser&
|
|
}
|
|
else if (keep && have_daemon)
|
|
{
|
|
- client.setPass(password.toLocal8Bit(), timeout);
|
|
+ client.setPass(password.toUtf8(), timeout);
|
|
client.setPriority(priority);
|
|
client.setScheduler(scheduler);
|
|
int result = client.exec(command, user, options, env);
|
|
@@ -478,7 +478,7 @@ static int startApp(QCommandLineParser&
|
|
proc.setPriority(priority);
|
|
proc.setScheduler(scheduler);
|
|
proc.setCommand(command);
|
|
- int result = proc.exec(password.toLocal8Bit());
|
|
+ int result = proc.exec(password.toUtf8());
|
|
return result;
|
|
}
|
|
return -1;
|