Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/logname.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/logname.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/logname.c

@@ -21 +21 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
+/* This is a NOFORK applet. Be very careful! */
+
+int logname_main(int argc, char ATTRIBUTE_UNUSED **argv);
 int logname_main(int argc, char ATTRIBUTE_UNUSED **argv)
 {
-    const char *p;
+    char buf[128];
 
     if (argc > 1) {
@@ -34 +34 @@
     }
 
-    if ((p = getlogin()) != NULL) {
-        puts(p);
-        bb_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(stdout);
     }