Patchs from Jeff Garzik <jgarzik@mandrakesoft.com> to cleanup

[oweals/busybox.git] / coreutils / whoami.c

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 6a5dd2c04ef9b5bfe37ce5bd252b41ee80ef1cec..0bbb54b7b2abaf594d844e0ac7ff3043cf4fa339 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,22 +20,23 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
-#include <pwd.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
 
 extern int whoami_main(int argc, char **argv)
 {
-       char *user = xmalloc(9);
+       char user[9];
        uid_t uid = geteuid();
 
        if (argc > 1)
-               usage(whoami_usage);
+               show_usage();
 
        my_getpwuid(user, uid);
-       if (user) {
+       if (*user) {
                puts(user);
                return EXIT_SUCCESS;
        }
-       error_msg_and_die("cannot find username for UID %u\n", (unsigned) uid);
+       error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
 }