More stuff

-Erik
This commit is contained in:
Erik Andersen
2000-05-02 00:07:56 +00:00
parent 3c1217cfad
commit 5afc864422
13 changed files with 68 additions and 34 deletions

View File

@@ -2,8 +2,10 @@
/*
* Mini tr implementation for busybox
*
* This version of tr is adapted from Minix tr
* Author: Michiel Huisjes
* Copyright (c) Michiel Huisjes
*
* This version of tr is adapted from Minix tr and was modified
* by Erik Andersen <andersee@debian.org> to be used in busybox.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

View File

@@ -29,16 +29,15 @@ static const char whoami_usage[] = "whoami\n\n"
extern int whoami_main(int argc, char **argv)
{
struct passwd *pw;
uid_t uid;
char *user = xmalloc(9);
uid_t uid = geteuid();
if (argc > 1)
usage(whoami_usage);
uid = geteuid();
pw = getpwuid(uid);
if (pw) {
puts(pw->pw_name);
my_getpwuid(user, uid);
if (user) {
puts(user);
exit(TRUE);
}
fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0],