projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable any buffering to stdout
[oweals/busybox.git]
/
coreutils
/
whoami.c
diff --git
a/coreutils/whoami.c
b/coreutils/whoami.c
index 950f52fb2e54feefe7aab388a63b14b901c9c6c3..f93034d3a3b860c8b8863cfa17303ee9a490e937 100644
(file)
--- a/
coreutils/whoami.c
+++ b/
coreutils/whoami.c
@@
-20,30
+20,25
@@
*
*/
*
*/
-#include "internal.h"
-#include <stdio.h>
-#include <pwd.h>
+/* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
-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)
{
extern int whoami_main(int argc, char **argv)
{
- char
*user = xmalloc(9)
;
- uid_t uid
= geteuid()
;
+ char
user[9]
;
+ uid_t uid;
if (argc > 1)
if (argc > 1)
-
usage(whoami_usage
);
+
bb_show_usage(
);
-
my_getpwuid(user, uid
);
- if (
user
) {
+
uid = geteuid(
);
+ if (
my_getpwuid(user, uid)
) {
puts(user);
puts(user);
-
exit(TRUE
);
+
bb_fflush_stdout_and_exit(EXIT_SUCCESS
);
}
}
- fprintf(stderr, "%s: cannot find username for UID %u\n", argv[0],
- (unsigned) uid);
- return(FALSE);
+ bb_error_msg_and_die("cannot find username for UID %u", (unsigned) uid);
}
}