diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2022-01-13 12:50:48 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2022-01-13 12:50:48 +0100 |
commit | 931c55f9e2b41473132683488820c6fb7c47506b (patch) | |
tree | 56cbfd7e7b1d85998192e5b61c132b9d4a465b8b /include | |
parent | b3eec1651fb02d70716caa355f49320719f74c75 (diff) | |
download | busybox-w32-931c55f9e2b41473132683488820c6fb7c47506b.tar.gz busybox-w32-931c55f9e2b41473132683488820c6fb7c47506b.tar.bz2 busybox-w32-931c55f9e2b41473132683488820c6fb7c47506b.zip |
libbb: invert the meaning of SETUP_ENV_NO_CHDIR -> SETUP_ENV_CHDIR
Double negatives are hard to grok.
function old new delta
login_main 986 988 +2
su_main 474 470 -4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 2/-4) Total: -2 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/libbb.h b/include/libbb.h index a0ffbef62..780e9ae7d 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1726,7 +1726,7 @@ extern void selinux_or_die(void) FAST_FUNC; | |||
1726 | 1726 | ||
1727 | 1727 | ||
1728 | /* setup_environment: | 1728 | /* setup_environment: |
1729 | * if !SETUP_ENV_NO_CHDIR: | 1729 | * if SETUP_ENV_CHDIR: |
1730 | * if cd(pw->pw_dir): ok: else if SETUP_ENV_TO_TMP: cd(/tmp) else: cd(/) or die | 1730 | * if cd(pw->pw_dir): ok: else if SETUP_ENV_TO_TMP: cd(/tmp) else: cd(/) or die |
1731 | * if SETUP_ENV_CLEARENV: cd(pw->pw_dir), clear environment, then set | 1731 | * if SETUP_ENV_CLEARENV: cd(pw->pw_dir), clear environment, then set |
1732 | * TERM=(old value) | 1732 | * TERM=(old value) |
@@ -1734,7 +1734,7 @@ extern void selinux_or_die(void) FAST_FUNC; | |||
1734 | * PATH=bb_default_[root_]path | 1734 | * PATH=bb_default_[root_]path |
1735 | * HOME=pw->pw_dir | 1735 | * HOME=pw->pw_dir |
1736 | * SHELL=shell | 1736 | * SHELL=shell |
1737 | * else if SETUP_ENV_CHANGEENV: | 1737 | * else if SETUP_ENV_CHANGEENV | SETUP_ENV_CHANGEENV_LOGNAME: |
1738 | * if not root (if pw->pw_uid != 0) or if SETUP_ENV_CHANGEENV_LOGNAME: | 1738 | * if not root (if pw->pw_uid != 0) or if SETUP_ENV_CHANGEENV_LOGNAME: |
1739 | * USER=pw->pw_name, LOGNAME=pw->pw_name | 1739 | * USER=pw->pw_name, LOGNAME=pw->pw_name |
1740 | * HOME=pw->pw_dir | 1740 | * HOME=pw->pw_dir |
@@ -1748,7 +1748,7 @@ extern void selinux_or_die(void) FAST_FUNC; | |||
1748 | #define SETUP_ENV_CHANGEENV_LOGNAME (1 << 1) | 1748 | #define SETUP_ENV_CHANGEENV_LOGNAME (1 << 1) |
1749 | #define SETUP_ENV_CLEARENV (1 << 2) | 1749 | #define SETUP_ENV_CLEARENV (1 << 2) |
1750 | #define SETUP_ENV_TO_TMP (1 << 3) | 1750 | #define SETUP_ENV_TO_TMP (1 << 3) |
1751 | #define SETUP_ENV_NO_CHDIR (1 << 4) | 1751 | #define SETUP_ENV_CHDIR (1 << 4) |
1752 | void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; | 1752 | void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; |
1753 | void nuke_str(char *str) FAST_FUNC; | 1753 | void nuke_str(char *str) FAST_FUNC; |
1754 | #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM | 1754 | #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM |