From: Martin Stiborsky <martin.stiborsky@gmail.com>
Date: Mon, 5 Jan 2015 23:02:23 +0000 (+0100)
Subject: getpwuid call moved
X-Git-Tag: 2.7~12^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F3%2Fhead;p=i3%2Fi3lock

getpwuid call moved
---

diff --git a/i3lock.c b/i3lock.c
index 4f9d5d4..942781a 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -661,7 +661,7 @@ static void raise_loop(xcb_window_t window) {
 }
 
 int main(int argc, char *argv[]) {
-    struct passwd *pw = getpwuid(getuid());
+    struct passwd *pw;
     char *username;
     char *image_path = NULL;
     int ret;
@@ -687,7 +687,7 @@ int main(int argc, char *argv[]) {
         {NULL, no_argument, NULL, 0}
     };
 
-    if (pw == NULL)
+    if ((pw = getpwuid(getuid())) == NULL)
         err(EXIT_FAILURE, "getpwuid() failed");
     if ((username = pw->pw_name) == NULL)
         errx(EXIT_FAILURE, "pw->pw_name is NULL.\n");