diff options
Diffstat (limited to 'release/src/router/busybox/coreutils/logname.c')
-rw-r--r-- | release/src/router/busybox/coreutils/logname.c | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/release/src/router/busybox/coreutils/logname.c b/release/src/router/busybox/coreutils/logname.c index 9cedff02..3400c30d 100644 --- a/release/src/router/busybox/coreutils/logname.c +++ b/release/src/router/busybox/coreutils/logname.c @@ -4,20 +4,7 @@ * * Copyright (C) 2000 Edward Betts <edward@debian.org>. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 compliant */ @@ -30,25 +17,26 @@ * 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. + * a diagnostic message and an error return. */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include "busybox.h" +#include "libbb.h" + +/* This is a NOFORK applet. Be very careful! */ -extern int logname_main(int argc, char **argv) +int logname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int logname_main(int argc, char **argv UNUSED_PARAM) { - const char *p; + char buf[128]; if (argc > 1) { bb_show_usage(); } - 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); } bb_perror_msg_and_die("getlogin"); |