Bump to version 1.22.1

[platform/upstream/busybox.git] / coreutils / logname.c

diff --git a/coreutils/logname.c b/coreutils/logname.c
index 695a736..10b9615 100644 (file)
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2000  Edward Betts <edward@debian.org>.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
@@ -20,22 +20,32 @@
  * a diagnostic message and an error return.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+//usage:#define logname_trivial_usage
+//usage:       ""
+//usage:#define logname_full_usage "\n\n"
+//usage:       "Print the name of the current user"
+//usage:
+//usage:#define logname_example_usage
+//usage:       "$ logname\n"
+//usage:       "root\n"
 
-int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+int logname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int logname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-       const char *p;
+       char buf[64];
 
-       if (argc > 1) {
+       if (argv[1]) {
                bb_show_usage();
        }
 
-       if ((p = getlogin()) != NULL) {
-               puts(p);
-               fflush_stdout_and_exit(EXIT_SUCCESS);
+       /* Using _r function - avoid pulling in static buffer from libc */
+       if (getlogin_r(buf, sizeof(buf)) == 0) {
+               puts(buf);
+               return fflush_all();
        }
 
        bb_perror_msg_and_die("getlogin");