diff options
author | Ron Yorston <rmy@pobox.com> | 2023-04-09 10:48:58 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2023-04-09 10:48:58 +0100 |
commit | fa04f2dc766c76f2caa44a4b8429185dde6a66b0 (patch) | |
tree | 5d860da97566c6492c0af7d7d5dfb29e232f93c4 /configs | |
parent | 99402ca92c77b13bee5181c129db18ecd9bf8938 (diff) | |
download | busybox-w32-fa04f2dc766c76f2caa44a4b8429185dde6a66b0.tar.gz busybox-w32-fa04f2dc766c76f2caa44a4b8429185dde6a66b0.tar.bz2 busybox-w32-fa04f2dc766c76f2caa44a4b8429185dde6a66b0.zip |
ash: remove ASH_IGNORE_CR config option
No further problems with CRLF handling have been reported. Remove
the configuration option that allowed some recent changes to be
turned off.
Also, prevent some WIN32 code from being included in the POSIX
build. The faulty code is from commit 64c8f5f3d (ash: add support
for INT trap).
These changes don't alter the default WIN32 build.
Diffstat (limited to 'configs')
-rw-r--r-- | configs/make32_defconfig | 1 | ||||
-rw-r--r-- | configs/make64_defconfig | 1 | ||||
-rw-r--r-- | configs/mingw32_defconfig | 1 | ||||
-rw-r--r-- | configs/mingw64_defconfig | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/configs/make32_defconfig b/configs/make32_defconfig index 354c2eb87..bafb6a63a 100644 --- a/configs/make32_defconfig +++ b/configs/make32_defconfig | |||
@@ -1158,7 +1158,6 @@ CONFIG_ASH_GETOPTS=y | |||
1158 | CONFIG_ASH_CMDCMD=y | 1158 | CONFIG_ASH_CMDCMD=y |
1159 | CONFIG_ASH_NOCONSOLE=y | 1159 | CONFIG_ASH_NOCONSOLE=y |
1160 | CONFIG_ASH_NOCASEGLOB=y | 1160 | CONFIG_ASH_NOCASEGLOB=y |
1161 | CONFIG_ASH_IGNORE_CR=y | ||
1162 | # CONFIG_CTTYHACK is not set | 1161 | # CONFIG_CTTYHACK is not set |
1163 | # CONFIG_HUSH is not set | 1162 | # CONFIG_HUSH is not set |
1164 | # CONFIG_SHELL_HUSH is not set | 1163 | # CONFIG_SHELL_HUSH is not set |
diff --git a/configs/make64_defconfig b/configs/make64_defconfig index 6564603c8..441c23b5a 100644 --- a/configs/make64_defconfig +++ b/configs/make64_defconfig | |||
@@ -1158,7 +1158,6 @@ CONFIG_ASH_GETOPTS=y | |||
1158 | CONFIG_ASH_CMDCMD=y | 1158 | CONFIG_ASH_CMDCMD=y |
1159 | CONFIG_ASH_NOCONSOLE=y | 1159 | CONFIG_ASH_NOCONSOLE=y |
1160 | CONFIG_ASH_NOCASEGLOB=y | 1160 | CONFIG_ASH_NOCASEGLOB=y |
1161 | CONFIG_ASH_IGNORE_CR=y | ||
1162 | # CONFIG_CTTYHACK is not set | 1161 | # CONFIG_CTTYHACK is not set |
1163 | # CONFIG_HUSH is not set | 1162 | # CONFIG_HUSH is not set |
1164 | # CONFIG_SHELL_HUSH is not set | 1163 | # CONFIG_SHELL_HUSH is not set |
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 4918b2f4f..16a7fd2d1 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
@@ -1170,7 +1170,6 @@ CONFIG_ASH_GETOPTS=y | |||
1170 | CONFIG_ASH_CMDCMD=y | 1170 | CONFIG_ASH_CMDCMD=y |
1171 | CONFIG_ASH_NOCONSOLE=y | 1171 | CONFIG_ASH_NOCONSOLE=y |
1172 | CONFIG_ASH_NOCASEGLOB=y | 1172 | CONFIG_ASH_NOCASEGLOB=y |
1173 | CONFIG_ASH_IGNORE_CR=y | ||
1174 | # CONFIG_CTTYHACK is not set | 1173 | # CONFIG_CTTYHACK is not set |
1175 | # CONFIG_HUSH is not set | 1174 | # CONFIG_HUSH is not set |
1176 | # CONFIG_SHELL_HUSH is not set | 1175 | # CONFIG_SHELL_HUSH is not set |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index 96e407644..96a5bdb0e 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
@@ -1170,7 +1170,6 @@ CONFIG_ASH_GETOPTS=y | |||
1170 | CONFIG_ASH_CMDCMD=y | 1170 | CONFIG_ASH_CMDCMD=y |
1171 | CONFIG_ASH_NOCONSOLE=y | 1171 | CONFIG_ASH_NOCONSOLE=y |
1172 | CONFIG_ASH_NOCASEGLOB=y | 1172 | CONFIG_ASH_NOCASEGLOB=y |
1173 | CONFIG_ASH_IGNORE_CR=y | ||
1174 | # CONFIG_CTTYHACK is not set | 1173 | # CONFIG_CTTYHACK is not set |
1175 | # CONFIG_HUSH is not set | 1174 | # CONFIG_HUSH is not set |
1176 | # CONFIG_SHELL_HUSH is not set | 1175 | # CONFIG_SHELL_HUSH is not set |