diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 14:52:19 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 14:52:19 +0100 |
commit | 7caf1369f5a84196d8e1b75f2febbc63d963a548 (patch) | |
tree | 0b936aad8ef7153c06283ab103b74292c5e77efa /coreutils | |
parent | af3f42011628585cd5c8f5c1fd4b43f2e370a23d (diff) | |
download | busybox-w32-7caf1369f5a84196d8e1b75f2febbc63d963a548.tar.gz busybox-w32-7caf1369f5a84196d8e1b75f2febbc63d963a548.tar.bz2 busybox-w32-7caf1369f5a84196d8e1b75f2febbc63d963a548.zip |
Make dos2unix/unix2dos independently selectable
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/dos2unix.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index 03986ad39..6d2347163 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c | |||
@@ -12,16 +12,15 @@ | |||
12 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 12 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
13 | */ | 13 | */ |
14 | //config:config DOS2UNIX | 14 | //config:config DOS2UNIX |
15 | //config: bool "dos2unix/unix2dos" | 15 | //config: bool "dos2unix" |
16 | //config: default y | 16 | //config: default y |
17 | //config: help | 17 | //config: help |
18 | //config: dos2unix is used to convert a text file from DOS format to | 18 | //config: dos2unix is used to convert a text file from DOS format to |
19 | //config: UNIX format, and vice versa. | 19 | //config: UNIX format, and vice versa. |
20 | //config: | 20 | //config: |
21 | //config:config UNIX2DOS | 21 | //config:config UNIX2DOS |
22 | //config: bool | 22 | //config: bool "unix2dos" |
23 | //config: default y | 23 | //config: default y |
24 | //config: depends on DOS2UNIX | ||
25 | //config: help | 24 | //config: help |
26 | //config: unix2dos is used to convert a text file from UNIX format to | 25 | //config: unix2dos is used to convert a text file from UNIX format to |
27 | //config: DOS format, and vice versa. | 26 | //config: DOS format, and vice versa. |
@@ -112,9 +111,12 @@ int dos2unix_main(int argc UNUSED_PARAM, char **argv) | |||
112 | int o, conv_type; | 111 | int o, conv_type; |
113 | 112 | ||
114 | /* See if we are supposed to be doing dos2unix or unix2dos */ | 113 | /* See if we are supposed to be doing dos2unix or unix2dos */ |
115 | conv_type = CT_UNIX2DOS; | 114 | if (ENABLE_DOS2UNIX |
116 | if (applet_name[0] == 'd') { | 115 | && (!ENABLE_UNIX2DOS || applet_name[0] == 'd') |
116 | ) { | ||
117 | conv_type = CT_DOS2UNIX; | 117 | conv_type = CT_DOS2UNIX; |
118 | } else { | ||
119 | conv_type = CT_UNIX2DOS; | ||
118 | } | 120 | } |
119 | 121 | ||
120 | /* -u convert to unix, -d convert to dos */ | 122 | /* -u convert to unix, -d convert to dos */ |