diff --git a/src/main.cpp b/src/main.cpp index 2969d74..51330e7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,7 +14,6 @@ extern "C" { #include #include #include -#include #include bool verbose = false; diff --git a/src/platformspecifics/mac/macbackend.cpp b/src/platformspecifics/mac/macbackend.cpp index 6665d6b..6940291 100644 --- a/src/platformspecifics/mac/macbackend.cpp +++ b/src/platformspecifics/mac/macbackend.cpp @@ -20,7 +20,7 @@ bool PlatformBackend::filenameValid(QString name) { } QString PlatformBackend::getCurrentUser() { - auto pwent = getpwent(); + auto pwent = getpwuid(getuid()); if (!pwent) { if (qEnvironmentVariableIsSet("USER")) return QString::fromLocal8Bit(qgetenv("USER")); diff --git a/src/platformspecifics/u32/u32backend.cpp b/src/platformspecifics/u32/u32backend.cpp index a9064aa..9f5de0c 100644 --- a/src/platformspecifics/u32/u32backend.cpp +++ b/src/platformspecifics/u32/u32backend.cpp @@ -50,7 +50,7 @@ QString PlatformBackend::getCurrentUser() { DWORD username_len = UNLEN + 1; QString userName; if (GetUserName(username, &username_len)) { - userName = QString::fromWCharArray(username, username_len); + userName = QString::fromWCharArray(username, username_len - 1); } delete[] username; return userName; diff --git a/src/platformspecifics/x11/x11backend.cpp b/src/platformspecifics/x11/x11backend.cpp index 8670967..dc49485 100644 --- a/src/platformspecifics/x11/x11backend.cpp +++ b/src/platformspecifics/x11/x11backend.cpp @@ -60,7 +60,7 @@ bool PlatformBackend::filenameValid(QString name) { } QString PlatformBackend::getCurrentUser() { - auto pwent = getpwent(); + auto pwent = getpwuid(getuid()); if (!pwent) { if (qEnvironmentVariableIsSet("USER")) return QString::fromLocal8Bit(qgetenv("USER"));