From 2f8335abf0d6347100cf63d82e8151ad0ff97ab0 Mon Sep 17 00:00:00 2001 From: "Ali H. Fardan" Date: Thu, 1 Sep 2016 21:35:32 +0300 Subject: simplified uid() and fixed username() --- slstatus.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'slstatus.c') diff --git a/slstatus.c b/slstatus.c index d360977..7337e4a 100644 --- a/slstatus.c +++ b/slstatus.c @@ -474,40 +474,21 @@ uptime(void) static char * username(void) { - /* FIXME: WHY USE REGISTER MODIFIER? */ - register struct passwd *pw; - register uid_t uid; + uid_t uid = geteuid(); + struct passwd *pw = getpwuid(uid); - uid = geteuid(); - pw = getpwuid(uid); - - if (pw) + if (pw == NULL) return smprintf("%s", pw->pw_name); - else { - fprintf(stderr, "Could not get username: %s\n", - strerror(errno)); - return smprintf(UNKNOWN_STR); - } + fprintf(stderr, "Could not get username: %s\n", + strerror(errno)); return smprintf(UNKNOWN_STR); } static char * uid(void) { - /* FIXME: WHY USE register modifier? */ - register uid_t uid; - - uid = geteuid(); - - if (uid) - return smprintf("%d", uid); - else { - fprintf(stderr, "Could not get uid.\n"); - return smprintf(UNKNOWN_STR); - } - - return smprintf(UNKNOWN_STR); + return smprintf("%d", geteuid()); } -- cgit v1.2.3