diff --git a/i3lock.c b/i3lock.c index 71b02ee..fd32f97 100644 --- a/i3lock.c +++ b/i3lock.c @@ -8,6 +8,7 @@ */ #include #include +#include #include #include #include @@ -658,8 +659,18 @@ static void raise_loop(xcb_window_t window) { } } +char* whoami(void) { + uid_t uid = geteuid(); + struct passwd *pw = getpwuid(uid); + if (pw) { + return pw->pw_name; + } else { + errx(EXIT_FAILURE, "Username not known!\n"); + } +} + int main(int argc, char *argv[]) { - char *username; + char *username = whoami(); char *image_path = NULL; int ret; struct pam_conv conv = {conv_callback, NULL}; @@ -684,9 +695,6 @@ int main(int argc, char *argv[]) { {NULL, no_argument, NULL, 0} }; - if ((username = getenv("USER")) == NULL) - errx(EXIT_FAILURE, "USER environment variable not set, please set it.\n"); - char *optstring = "hvnbdc:p:ui:teI:f"; while ((o = getopt_long(argc, argv, optstring, longopts, &optind)) != -1) { switch (o) {