aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-08-30 08:44:58 +0100
committerRon Yorston <rmy@pobox.com>2021-08-30 09:16:01 +0100
commit420afde92eb83c8c19b856f45491568cfa04a625 (patch)
treeeec8392147bc79ac58d0341be5b23ce97d4f5a21 /configs
parenta9fc40467450f5afa9b220bb7c0fa9cade71c7a5 (diff)
downloadbusybox-w32-420afde92eb83c8c19b856f45491568cfa04a625.tar.gz
busybox-w32-420afde92eb83c8c19b856f45491568cfa04a625.tar.bz2
busybox-w32-420afde92eb83c8c19b856f45491568cfa04a625.zip
vi: add fileformats option
Add a limited version of the 'fileformats' option. Only the 'dos,unix' and 'unix,dos' settings are allowed with the former as default. When a file is read for editing its format is detected. If it only has LF line endings it's treated as being of type 'unix' otherwise its type is 'dos'. When an empty edit buffer is created it's given the first file type listed in 'fileformats'. The file type is stored in the read-only option 'fileformat' and is used to select the appropriate line endings when the file is written. See GitHub issue #220. Adds 168 bytes to the binary.
Diffstat (limited to 'configs')
-rw-r--r--configs/mingw32_defconfig18
-rw-r--r--configs/mingw64_defconfig18
2 files changed, 22 insertions, 14 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index d9466af1d..179af2f67 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.34.0.git 3# Busybox version: 1.35.0.git
4# Sat Jul 24 10:37:11 2021 4# Mon Aug 30 08:54:18 2021
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -226,11 +226,13 @@ CONFIG_CHMOD=y
226# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set 226# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
227# CONFIG_CHROOT is not set 227# CONFIG_CHROOT is not set
228CONFIG_CKSUM=y 228CONFIG_CKSUM=y
229CONFIG_CRC32=y
229CONFIG_COMM=y 230CONFIG_COMM=y
230CONFIG_CP=y 231CONFIG_CP=y
231CONFIG_FEATURE_CP_LONG_OPTIONS=y 232CONFIG_FEATURE_CP_LONG_OPTIONS=y
232# CONFIG_FEATURE_CP_REFLINK is not set 233# CONFIG_FEATURE_CP_REFLINK is not set
233CONFIG_CUT=y 234CONFIG_CUT=y
235CONFIG_FEATURE_CUT_REGEX=y
234CONFIG_DATE=y 236CONFIG_DATE=y
235CONFIG_FEATURE_DATE_ISOFMT=y 237CONFIG_FEATURE_DATE_ISOFMT=y
236# CONFIG_FEATURE_DATE_NANO is not set 238# CONFIG_FEATURE_DATE_NANO is not set
@@ -354,10 +356,10 @@ CONFIG_BASE64=y
354CONFIG_UUENCODE=y 356CONFIG_UUENCODE=y
355CONFIG_WC=y 357CONFIG_WC=y
356CONFIG_FEATURE_WC_LARGE=y 358CONFIG_FEATURE_WC_LARGE=y
357CONFIG_WHOAMI=y
358# CONFIG_WHO is not set 359# CONFIG_WHO is not set
359# CONFIG_W is not set 360# CONFIG_W is not set
360# CONFIG_USERS is not set 361# CONFIG_USERS is not set
362CONFIG_WHOAMI=y
361CONFIG_YES=y 363CONFIG_YES=y
362 364
363# 365#
@@ -446,6 +448,7 @@ CONFIG_FEATURE_VI_REGEX_SEARCH=y
446CONFIG_FEATURE_VI_DOT_CMD=y 448CONFIG_FEATURE_VI_DOT_CMD=y
447CONFIG_FEATURE_VI_READONLY=y 449CONFIG_FEATURE_VI_READONLY=y
448CONFIG_FEATURE_VI_SETOPTS=y 450CONFIG_FEATURE_VI_SETOPTS=y
451CONFIG_FEATURE_VI_FILE_FORMAT=y
449CONFIG_FEATURE_VI_SET=y 452CONFIG_FEATURE_VI_SET=y
450CONFIG_FEATURE_VI_WIN_RESIZE=y 453CONFIG_FEATURE_VI_WIN_RESIZE=y
451# CONFIG_FEATURE_VI_ASK_TERMINAL is not set 454# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
@@ -530,10 +533,10 @@ CONFIG_INIT_TERMINAL_TYPE=""
530# CONFIG_USE_BB_SHADOW is not set 533# CONFIG_USE_BB_SHADOW is not set
531# CONFIG_USE_BB_CRYPT is not set 534# CONFIG_USE_BB_CRYPT is not set
532# CONFIG_USE_BB_CRYPT_SHA is not set 535# CONFIG_USE_BB_CRYPT_SHA is not set
533# CONFIG_ADDGROUP is not set
534# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
535# CONFIG_ADD_SHELL is not set 536# CONFIG_ADD_SHELL is not set
536# CONFIG_REMOVE_SHELL is not set 537# CONFIG_REMOVE_SHELL is not set
538# CONFIG_ADDGROUP is not set
539# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
537# CONFIG_ADDUSER is not set 540# CONFIG_ADDUSER is not set
538# CONFIG_FEATURE_CHECK_NAMES is not set 541# CONFIG_FEATURE_CHECK_NAMES is not set
539CONFIG_LAST_ID=0 542CONFIG_LAST_ID=0
@@ -752,6 +755,7 @@ CONFIG_REV=y
752# Miscellaneous Utilities 755# Miscellaneous Utilities
753# 756#
754# CONFIG_ADJTIMEX is not set 757# CONFIG_ADJTIMEX is not set
758CONFIG_ASCII=y
755# CONFIG_BBCONFIG is not set 759# CONFIG_BBCONFIG is not set
756# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set 760# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
757CONFIG_BC=y 761CONFIG_BC=y
@@ -785,10 +789,10 @@ CONFIG_FEATURE_CROND_DIR=""
785# CONFIG_FEATURE_DEVFS is not set 789# CONFIG_FEATURE_DEVFS is not set
786# CONFIG_DEVMEM is not set 790# CONFIG_DEVMEM is not set
787# CONFIG_FBSPLASH is not set 791# CONFIG_FBSPLASH is not set
788# CONFIG_FLASHCP is not set
789# CONFIG_FLASH_ERASEALL is not set 792# CONFIG_FLASH_ERASEALL is not set
790# CONFIG_FLASH_LOCK is not set 793# CONFIG_FLASH_LOCK is not set
791# CONFIG_FLASH_UNLOCK is not set 794# CONFIG_FLASH_UNLOCK is not set
795# CONFIG_FLASHCP is not set
792# CONFIG_HDPARM is not set 796# CONFIG_HDPARM is not set
793# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set 797# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
794# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set 798# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -839,13 +843,13 @@ CONFIG_STRINGS=y
839CONFIG_TIME=y 843CONFIG_TIME=y
840CONFIG_TS=y 844CONFIG_TS=y
841CONFIG_TTYSIZE=y 845CONFIG_TTYSIZE=y
842# CONFIG_UBIRENAME is not set
843# CONFIG_UBIATTACH is not set 846# CONFIG_UBIATTACH is not set
844# CONFIG_UBIDETACH is not set 847# CONFIG_UBIDETACH is not set
845# CONFIG_UBIMKVOL is not set 848# CONFIG_UBIMKVOL is not set
846# CONFIG_UBIRMVOL is not set 849# CONFIG_UBIRMVOL is not set
847# CONFIG_UBIRSVOL is not set 850# CONFIG_UBIRSVOL is not set
848# CONFIG_UBIUPDATEVOL is not set 851# CONFIG_UBIUPDATEVOL is not set
852# CONFIG_UBIRENAME is not set
849# CONFIG_VOLNAME is not set 853# CONFIG_VOLNAME is not set
850# CONFIG_WATCHDOG is not set 854# CONFIG_WATCHDOG is not set
851# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set 855# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index ef1ba4e22..f9be9aab2 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.34.0.git 3# Busybox version: 1.35.0.git
4# Sat Jul 24 10:37:11 2021 4# Mon Aug 30 08:54:18 2021
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7# CONFIG_PLATFORM_POSIX is not set 7# CONFIG_PLATFORM_POSIX is not set
@@ -226,11 +226,13 @@ CONFIG_CHMOD=y
226# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set 226# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
227# CONFIG_CHROOT is not set 227# CONFIG_CHROOT is not set
228CONFIG_CKSUM=y 228CONFIG_CKSUM=y
229CONFIG_CRC32=y
229CONFIG_COMM=y 230CONFIG_COMM=y
230CONFIG_CP=y 231CONFIG_CP=y
231CONFIG_FEATURE_CP_LONG_OPTIONS=y 232CONFIG_FEATURE_CP_LONG_OPTIONS=y
232# CONFIG_FEATURE_CP_REFLINK is not set 233# CONFIG_FEATURE_CP_REFLINK is not set
233CONFIG_CUT=y 234CONFIG_CUT=y
235CONFIG_FEATURE_CUT_REGEX=y
234CONFIG_DATE=y 236CONFIG_DATE=y
235CONFIG_FEATURE_DATE_ISOFMT=y 237CONFIG_FEATURE_DATE_ISOFMT=y
236# CONFIG_FEATURE_DATE_NANO is not set 238# CONFIG_FEATURE_DATE_NANO is not set
@@ -354,10 +356,10 @@ CONFIG_BASE64=y
354CONFIG_UUENCODE=y 356CONFIG_UUENCODE=y
355CONFIG_WC=y 357CONFIG_WC=y
356CONFIG_FEATURE_WC_LARGE=y 358CONFIG_FEATURE_WC_LARGE=y
357CONFIG_WHOAMI=y
358# CONFIG_WHO is not set 359# CONFIG_WHO is not set
359# CONFIG_W is not set 360# CONFIG_W is not set
360# CONFIG_USERS is not set 361# CONFIG_USERS is not set
362CONFIG_WHOAMI=y
361CONFIG_YES=y 363CONFIG_YES=y
362 364
363# 365#
@@ -446,6 +448,7 @@ CONFIG_FEATURE_VI_REGEX_SEARCH=y
446CONFIG_FEATURE_VI_DOT_CMD=y 448CONFIG_FEATURE_VI_DOT_CMD=y
447CONFIG_FEATURE_VI_READONLY=y 449CONFIG_FEATURE_VI_READONLY=y
448CONFIG_FEATURE_VI_SETOPTS=y 450CONFIG_FEATURE_VI_SETOPTS=y
451CONFIG_FEATURE_VI_FILE_FORMAT=y
449CONFIG_FEATURE_VI_SET=y 452CONFIG_FEATURE_VI_SET=y
450CONFIG_FEATURE_VI_WIN_RESIZE=y 453CONFIG_FEATURE_VI_WIN_RESIZE=y
451# CONFIG_FEATURE_VI_ASK_TERMINAL is not set 454# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
@@ -530,10 +533,10 @@ CONFIG_INIT_TERMINAL_TYPE=""
530# CONFIG_USE_BB_SHADOW is not set 533# CONFIG_USE_BB_SHADOW is not set
531# CONFIG_USE_BB_CRYPT is not set 534# CONFIG_USE_BB_CRYPT is not set
532# CONFIG_USE_BB_CRYPT_SHA is not set 535# CONFIG_USE_BB_CRYPT_SHA is not set
533# CONFIG_ADDGROUP is not set
534# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
535# CONFIG_ADD_SHELL is not set 536# CONFIG_ADD_SHELL is not set
536# CONFIG_REMOVE_SHELL is not set 537# CONFIG_REMOVE_SHELL is not set
538# CONFIG_ADDGROUP is not set
539# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
537# CONFIG_ADDUSER is not set 540# CONFIG_ADDUSER is not set
538# CONFIG_FEATURE_CHECK_NAMES is not set 541# CONFIG_FEATURE_CHECK_NAMES is not set
539CONFIG_LAST_ID=0 542CONFIG_LAST_ID=0
@@ -752,6 +755,7 @@ CONFIG_REV=y
752# Miscellaneous Utilities 755# Miscellaneous Utilities
753# 756#
754# CONFIG_ADJTIMEX is not set 757# CONFIG_ADJTIMEX is not set
758CONFIG_ASCII=y
755# CONFIG_BBCONFIG is not set 759# CONFIG_BBCONFIG is not set
756# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set 760# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
757CONFIG_BC=y 761CONFIG_BC=y
@@ -785,10 +789,10 @@ CONFIG_FEATURE_CROND_DIR=""
785# CONFIG_FEATURE_DEVFS is not set 789# CONFIG_FEATURE_DEVFS is not set
786# CONFIG_DEVMEM is not set 790# CONFIG_DEVMEM is not set
787# CONFIG_FBSPLASH is not set 791# CONFIG_FBSPLASH is not set
788# CONFIG_FLASHCP is not set
789# CONFIG_FLASH_ERASEALL is not set 792# CONFIG_FLASH_ERASEALL is not set
790# CONFIG_FLASH_LOCK is not set 793# CONFIG_FLASH_LOCK is not set
791# CONFIG_FLASH_UNLOCK is not set 794# CONFIG_FLASH_UNLOCK is not set
795# CONFIG_FLASHCP is not set
792# CONFIG_HDPARM is not set 796# CONFIG_HDPARM is not set
793# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set 797# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
794# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set 798# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -839,13 +843,13 @@ CONFIG_STRINGS=y
839CONFIG_TIME=y 843CONFIG_TIME=y
840CONFIG_TS=y 844CONFIG_TS=y
841CONFIG_TTYSIZE=y 845CONFIG_TTYSIZE=y
842# CONFIG_UBIRENAME is not set
843# CONFIG_UBIATTACH is not set 846# CONFIG_UBIATTACH is not set
844# CONFIG_UBIDETACH is not set 847# CONFIG_UBIDETACH is not set
845# CONFIG_UBIMKVOL is not set 848# CONFIG_UBIMKVOL is not set
846# CONFIG_UBIRMVOL is not set 849# CONFIG_UBIRMVOL is not set
847# CONFIG_UBIRSVOL is not set 850# CONFIG_UBIRSVOL is not set
848# CONFIG_UBIUPDATEVOL is not set 851# CONFIG_UBIUPDATEVOL is not set
852# CONFIG_UBIRENAME is not set
849# CONFIG_VOLNAME is not set 853# CONFIG_VOLNAME is not set
850# CONFIG_WATCHDOG is not set 854# CONFIG_WATCHDOG is not set
851# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set 855# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set