[un]expand: account for different character widths. +16 bytes.

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

diff --git a/coreutils/logname.c b/coreutils/logname.c
index 743e2291c61d5bcdd200c64cdb595f8f5a9b9127..8357b9a3364ffb14a972eaca6b963a958d1e7752 100644 (file)
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -20,23 +20,23 @@
  * a diagnostic message and an error return.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int logname_main(int argc, char ATTRIBUTE_UNUSED **argv);
-int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
+/* 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");