mirrors
/
i3lock
mirror of https://github.com/i3/i3lock.git
1
0
Fork 0
Code Issues Releases Wiki Activity

removed the whoami function, replaced with an inline getpwuid call

pull/3/head
Martin Stiborsky 2015-01-05 19:54:48 +01:00
parent a3839aa69f
commit 7d52029ae3
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
i3lock.c
View File

@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <pwd.h>
#include <sys/types.h>
#include <string.h>
#include <unistd.h>
#include <stdbool.h>
@ -659,18 +660,8 @@ 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 = whoami();
char *username = getpwuid(getuid())->pw_name;
char *image_path = NULL;
int ret;
struct pam_conv conv = {conv_callback, NULL};
@ -695,6 +686,9 @@ int main(int argc, char *argv[]) {
{NULL, no_argument, NULL, 0}
};
if (username == NULL)
err(EXIT_FAILURE, "getpwuid() failed");
char *optstring = "hvnbdc:p:ui:teI:f";
while ((o = getopt_long(argc, argv, optstring, longopts, &optind)) != -1) {
switch (o) {