hush: add leak detector helper; fix/add tests for it

[oweals/busybox.git] / loginutils / su.c

diff --git a/loginutils/su.c b/loginutils/su.c
index 8c55170ca165f77fdee46b5396d96440ecf60fab..de8c18d25e40ef1b26247078e9e756c7bed5909f 100644 (file)
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -12,7 +12,7 @@
 #define SU_OPT_l (4)
 
 int su_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int su_main(int argc, char **argv)
+int su_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned flags;
        char *opt_shell = NULL;
@@ -24,19 +24,17 @@ int su_main(int argc, char **argv)
        char *old_user;
 
        flags = getopt32(argv, "mplc:s:", &opt_command, &opt_shell);
-       argc -= optind;
+       //argc -= optind;
        argv += optind;
 
-       if (argc && LONE_DASH(argv[0])) {
+       if (argv[0] && LONE_DASH(argv[0])) {
                flags |= SU_OPT_l;
-               argc--;
                argv++;
        }
 
        /* get user if specified */
-       if (argc) {
+       if (argv[0]) {
                opt_username = argv[0];
-               //argc--; - not used below anyway
                argv++;
        }
 
@@ -46,13 +44,11 @@ int su_main(int argc, char **argv)
                But getlogin can fail -- usually due to lack of utmp entry.
                in this case resort to getpwuid.  */
                old_user = xstrdup(USE_FEATURE_UTMP(getlogin() ? : ) (pw = getpwuid(cur_uid)) ? pw->pw_name : "");
-               tty = ttyname(2) ? : "none";
+               tty = xmalloc_ttyname(2) ? : "none";
                openlog(applet_name, 0, LOG_AUTH);
        }
 
-       pw = getpwnam(opt_username);
-       if (!pw)
-               bb_error_msg_and_die("unknown id: %s", opt_username);
+       pw = xgetpwnam(opt_username);
 
        /* Make sure pw->pw_shell is non-NULL.  It may be NULL when NEW_USER
           is a username that is retrieved via NIS (YP), but that doesn't have
@@ -93,7 +89,7 @@ int su_main(int argc, char **argv)
                opt_shell = pw->pw_shell;
 
        change_identity(pw);
-       /* setup_environment params: shell, loginshell, changeenv, pw */
+       /* setup_environment params: shell, clear_env, change_env, pw */
        setup_environment(opt_shell, flags & SU_OPT_l, !(flags & SU_OPT_mp), pw);
        USE_SELINUX(set_current_security_context(NULL);)