sheldonmlee/slstatus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplified uid() and fixed username()

Browse Source
This commit is contained in:
Ali H. Fardan 2016-09-01 21:35:32 +03:00
parent 825141633b
commit 2f8335abf0
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
slstatus.c
View File

@ -474,40 +474,21 @@ uptime(void)
static char * static char *
username(void) username(void)
{ {
/* FIXME: WHY USE REGISTER MODIFIER? */ uid_t uid = geteuid();
register struct passwd *pw; struct passwd *pw = getpwuid(uid);
register uid_t uid;
uid = geteuid(); if (pw == NULL)
pw = getpwuid(uid);
if (pw)
return smprintf("%s", pw->pw_name); return smprintf("%s", pw->pw_name);
else {
fprintf(stderr, "Could not get username: %s\n", fprintf(stderr, "Could not get username: %s\n",
strerror(errno)); strerror(errno));
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
return smprintf(UNKNOWN_STR);
}
static char * static char *
uid(void) uid(void)
{ {
/* FIXME: WHY USE register modifier? */ return smprintf("%d", geteuid());
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);
} }