diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /coreutils/dos2unix.c | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/dos2unix.c')
| -rw-r--r-- | coreutils/dos2unix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index a3d008051..9f098e41e 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c | |||
| @@ -120,8 +120,7 @@ int dos2unix_main(int argc UNUSED_PARAM, char **argv) | |||
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | /* -u convert to unix, -d convert to dos */ | 122 | /* -u convert to unix, -d convert to dos */ |
| 123 | opt_complementary = "u--d:d--u"; /* mutually exclusive */ | 123 | o = getopt32(argv, "^" "du" "\0" "u--d:d--u"); /* mutually exclusive */ |
| 124 | o = getopt32(argv, "du"); | ||
| 125 | 124 | ||
| 126 | /* Do the conversion requested by an argument else do the default | 125 | /* Do the conversion requested by an argument else do the default |
| 127 | * conversion depending on our name. */ | 126 | * conversion depending on our name. */ |