From cad5364599eb5062d59e0c397ed638ddd61a8d5d Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Wed, 19 Mar 2003 09:13:01 +0000 Subject: Major coreutils update. --- coreutils/logname.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'coreutils/logname.c') diff --git a/coreutils/logname.c b/coreutils/logname.c index 3e10fba6f..9cedff027 100644 --- a/coreutils/logname.c +++ b/coreutils/logname.c @@ -20,6 +20,19 @@ * */ +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/logname.html */ + +/* 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 dianostic message and an error return. + */ + #include #include #include @@ -27,14 +40,16 @@ extern int logname_main(int argc, char **argv) { - char user[9]; + const char *p; - if (argc > 1) - show_usage(); + if (argc > 1) { + bb_show_usage(); + } - if (my_getpwuid(user, geteuid())) { - puts(user); - return EXIT_SUCCESS; + if ((p = getlogin()) != NULL) { + puts(p); + bb_fflush_stdout_and_exit(EXIT_SUCCESS); } - error_msg_and_die("no login name"); + + bb_perror_msg_and_die("getlogin"); } -- cgit v1.2.3