[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcoreaddons] src/lib/util: Fix warning when name is empty
From:       David Faure <faure () kde ! org>
Date:       2014-10-31 22:04:11
Message-ID: E1XkKIl-0002x8-IM () scm ! kde ! org
[Download RAW message or body]

Git commit b0d542e0f4a213945161dd926145aa1dd6df75e3 by David Faure.
Committed on 31/10/2014 at 22:01.
Pushed by dfaure into branch 'master'.

Fix warning when name is empty

"KUserId::fromName: Failed to lookup user : Success"

It happened every time someone called KIO::chmod, since the user and group
default to QString().

M  +6    -0    src/lib/util/kuser_unix.cpp

http://commits.kde.org/kcoreaddons/b0d542e0f4a213945161dd926145aa1dd6df75e3

diff --git a/src/lib/util/kuser_unix.cpp b/src/lib/util/kuser_unix.cpp
index a6cc7bb..c0ea698 100644
--- a/src/lib/util/kuser_unix.cpp
+++ b/src/lib/util/kuser_unix.cpp
@@ -493,6 +493,9 @@ KUserGroup::~KUserGroup()
 
 KUserId KUserId::fromName(const QString &name)
 {
+    if (name.isEmpty()) {
+        return KUserId();
+    }
     QByteArray name8Bit = name.toLocal8Bit();
     struct passwd *p = ::getpwnam(name8Bit.constData());
     if (!p) {
@@ -504,6 +507,9 @@ KUserId KUserId::fromName(const QString &name)
 
 KGroupId KGroupId::fromName(const QString &name)
 {
+    if (name.isEmpty()) {
+        return KGroupId();
+    }
     QByteArray name8Bit = name.toLocal8Bit();
     struct group *g = ::getgrnam(name8Bit.constData());
     if (!g) {
[prev in list] [next in list] [prev in thread] [next in thread]