diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-07-24 11:40:28 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-07-24 12:03:28 +0100 |
| commit | 60411636073cdc08e8005f0de00098e6dd00eaf5 (patch) | |
| tree | 58673b64af1e663280be81f798c8f66ce116d1dd /coreutils/dos2unix.c | |
| parent | eeceafbc5c4caf513c6d92b7d71ecb0ccd89a3f8 (diff) | |
| parent | b72f1ef17b97802d33f0ac522f64bea0f65442c5 (diff) | |
| download | busybox-w32-60411636073cdc08e8005f0de00098e6dd00eaf5.tar.gz busybox-w32-60411636073cdc08e8005f0de00098e6dd00eaf5.tar.bz2 busybox-w32-60411636073cdc08e8005f0de00098e6dd00eaf5.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/dos2unix.c')
| -rw-r--r-- | coreutils/dos2unix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index 9d81ccca6..a3d008051 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c | |||
| @@ -12,18 +12,18 @@ | |||
| 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" | 15 | //config: bool "dos2unix (5.1 kb)" |
| 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 "unix2dos" | 22 | //config: bool "unix2dos (5.1 kb)" |
| 23 | //config: default y | 23 | //config: default y |
| 24 | //config: help | 24 | //config: help |
| 25 | //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 |
| 26 | //config: DOS format, and vice versa. | 26 | //config: DOS format, and vice versa. |
| 27 | 27 | ||
| 28 | //applet:IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, dos2unix)) | 28 | //applet:IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, dos2unix)) |
| 29 | //applet:IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, unix2dos)) | 29 | //applet:IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, unix2dos)) |