*
*/
-#include "internal.h"
-#include <stdio.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/logname.html */
-static const char logname_usage[] = "logname\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nPrint the name of the current user.\n"
-#endif
- ;
+/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
+ *
+ * SUSv3 specifies the string used is that returned from getlogin().
+ * The previous implementation used getpwuid() for geteuid(), which
+ * is _not_ the same. Erik apparently made this change almost 3 years
+ * ago to avoid failing when no utmp was available. However, the
+ * correct course of action wrt SUSv3 for a failing getlogin() is
+ * a diagnostic message and an error return.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "busybox.h"
extern int logname_main(int argc, char **argv)
{
- char *user = xmalloc(9);
+ const char *p;
- if (argc > 1)
- usage(logname_usage);
+ if (argc > 1) {
+ bb_show_usage();
+ }
- my_getpwuid(user, geteuid());
- if (user) {
- puts(user);
- exit(TRUE);
+ if ((p = getlogin()) != NULL) {
+ puts(p);
+ bb_fflush_stdout_and_exit(EXIT_SUCCESS);
}
- fprintf(stderr, "no login name\n");
- exit(FALSE);
+
+ bb_perror_msg_and_die("getlogin");
}