consolidate xz format comment. no code changes

[oweals/busybox.git] / libbb / setup_environment.c

diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index f0802f0e5e23cfb2ecaca443602d71f74c01bd1e..a95fbc5bfc4da7dd967fea91720f2c50ecf1619d 100644 (file)
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -30,7 +30,7 @@
 
 #include "libbb.h"
 
-void FAST_FUNC setup_environment(const char *shell, int clear_env, int flags, const struct passwd *pw)
+void FAST_FUNC setup_environment(const char *shell, int flags, const struct passwd *pw)
 {
        /* Change the current working directory to be the home directory
         * of the user */
@@ -39,11 +39,11 @@ void FAST_FUNC setup_environment(const char *shell, int clear_env, int flags, co
                bb_error_msg("can't chdir to home directory '%s'", pw->pw_dir);
        }
 
-       if (clear_env) {
+       if (flags & SETUP_ENV_CLEARENV) {
                const char *term;
 
                /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH.
-                  Unset all other environment variables.  */
+                * Unset all other environment variables.  */
                term = getenv("TERM");
                clearenv();
                if (term)
@@ -57,7 +57,7 @@ void FAST_FUNC setup_environment(const char *shell, int clear_env, int flags, co
                //xsetenv("SHELL",   shell);
        } else if (flags & SETUP_ENV_CHANGEENV) {
                /* Set HOME, SHELL, and if not becoming a super-user,
-                  USER and LOGNAME.  */
+                * USER and LOGNAME.  */
                if (pw->pw_uid) {
  shortcut:
                        xsetenv("USER",    pw->pw_name);