Some more patchelttes from Larry Doolittle.

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

diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 01dff81f919b8b41be7be720f1177e5ba303adcf..c3b1140e6c940ddd40460eb7900cb5fcf90bf11d 100644 (file)
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,29 +20,25 @@
  *
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <pwd.h>
+/* getopt not needed */
 
-static const char whoami_usage[] = "whoami\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nPrints the user name associated with the current effective user id.\n"
-#endif
-       ;
+#include <stdio.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);
-               exit(TRUE);
+               return EXIT_SUCCESS;
        }
-       errorMsg("cannot find username for UID %u\n", (unsigned) uid);
-       return(FALSE);
+       error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
 }