When mounting a ro fs rw, print warning and then mount it ro. Patch

[oweals/busybox.git] / logname.c

diff --git a/logname.c b/logname.c
index 182f40ed2b959e55ca446c86011157141f401f3b..a0aff42d648611b9c840e86ed10baf42e24c3f1a 100644 (file)
--- a/logname.c
+++ b/logname.c
@@ -23,22 +23,18 @@
 #include "internal.h"
 #include <stdio.h>
 
-static const char logname_usage[] = "logname\n\n"
-
-       "Print the name of the current user.\n";
-
 extern int logname_main(int argc, char **argv)
 {
-       char *cp;
+       char *user = xmalloc(9);
 
        if (argc > 1)
                usage(logname_usage);
 
-       cp = getlogin();
-       if (cp) {
-               puts(cp);
+       my_getpwuid(user, geteuid());
+       if (user) {
+               puts(user);
                exit(TRUE);
        }
-       fprintf(stderr, "%s: no login name\n", argv[0]);
-       exit(FALSE);
+       errorMsg("no login name\n");
+       return(FALSE);
 }