Gurkengewuerz
/
KShare
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix user fetching logic

This commit is contained in:
ArsenArsen 2018-02-25 22:29:31 +01:00
parent 10bd9a67c2
commit ee69213cdf
No known key found for this signature in database
GPG Key ID: 683D2F43B0CA4BD2
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.cpp
View File

@ -14,7 +14,6 @@ extern "C" {
#include <QListWidget> #include <QListWidget>
#include <QTranslator> #include <QTranslator>
#include <notifications.hpp> #include <notifications.hpp>
#include <platformbackend.hpp>
#include <worker/worker.hpp> #include <worker/worker.hpp>
bool verbose = false; bool verbose = false;

2
src/platformspecifics/mac/macbackend.cpp
View File

@ -20,7 +20,7 @@ bool PlatformBackend::filenameValid(QString name) {
} }
QString PlatformBackend::getCurrentUser() { QString PlatformBackend::getCurrentUser() {
auto pwent = getpwent(); auto pwent = getpwuid(getuid());
if (!pwent) { if (!pwent) {
if (qEnvironmentVariableIsSet("USER")) if (qEnvironmentVariableIsSet("USER"))
return QString::fromLocal8Bit(qgetenv("USER")); return QString::fromLocal8Bit(qgetenv("USER"));

2
src/platformspecifics/u32/u32backend.cpp
View File

@ -50,7 +50,7 @@ QString PlatformBackend::getCurrentUser() {
DWORD username_len = UNLEN + 1; DWORD username_len = UNLEN + 1;
QString userName; QString userName;
if (GetUserName(username, &username_len)) { if (GetUserName(username, &username_len)) {
userName = QString::fromWCharArray(username, username_len); userName = QString::fromWCharArray(username, username_len - 1);
} }
delete[] username; delete[] username;
return userName; return userName;

2
src/platformspecifics/x11/x11backend.cpp
View File

@ -60,7 +60,7 @@ bool PlatformBackend::filenameValid(QString name) {
} }
QString PlatformBackend::getCurrentUser() { QString PlatformBackend::getCurrentUser() {
auto pwent = getpwent(); auto pwent = getpwuid(getuid());
if (!pwent) { if (!pwent) {
if (qEnvironmentVariableIsSet("USER")) if (qEnvironmentVariableIsSet("USER"))
return QString::fromLocal8Bit(qgetenv("USER")); return QString::fromLocal8Bit(qgetenv("USER"));