- strip implied proto and superfluous "www." domain part.

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

diff --git a/loginutils/su.c b/loginutils/su.c
index 9a134dd88a32a47fb3a4ff6a0b70541d99c23829..61039d823f77240748eda605cd804b8a076b5450 100644 (file)
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -5,13 +5,14 @@
  *  Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <syslog.h>
 
 #define SU_OPT_mp (3)
 #define SU_OPT_l (4)
 
-int su_main(int argc, char **argv)
+int su_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int su_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned flags;
        char *opt_shell = NULL;
@@ -22,20 +23,18 @@ int su_main(int argc, char **argv)
        const char *tty;
        char *old_user;
 
-       flags = getopt32(argc, argv, "mplc:s:", &opt_command, &opt_shell);
-       argc -= optind;
+       flags = getopt32(argv, "mplc:s:", &opt_command, &opt_shell);
+       //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--;
                argv++;
        }
 
@@ -85,18 +84,19 @@ int su_main(int argc, char **argv)
                   compromise the account by allowing access with a standard
                   shell.  */
                bb_error_msg("using restricted shell");
-               opt_shell = 0;
+               opt_shell = NULL;
        }
 #endif
        if (!opt_shell)
                opt_shell = pw->pw_shell;
 
        change_identity(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);)
 
        /* Never returns */
        run_shell(opt_shell, flags & SU_OPT_l, opt_command, (const char**)argv);
 
-       return EXIT_FAILURE;
+       /* return EXIT_FAILURE; - not reached */
 }