bc: convert to "G trick" - this returns bc to zero bss increase

[oweals/busybox.git] / coreutils / dos2unix.c

diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index ccb74a1132b99975fbd6622bb7b2a5bf52e9630d..9f098e41e714a46568887656932ae34791807d7e 100644 (file)
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -2,7 +2,7 @@
 /*
  * dos2unix for BusyBox
  *
- * dos2unix '\n' convertor 0.5.0
+ * dos2unix '\n' converter 0.5.0
  * based on Unix2Dos 0.9.0 by Peter Hanecak (made 19.2.1997)
  * Copyright 1997,.. by Peter Hanecak <hanecak@megaloman.sk>.
  * All rights reserved.
@@ -10,7 +10,26 @@
  * dos2unix filters reading input from stdin and writing output to stdout.
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-*/
+ */
+//config:config DOS2UNIX
+//config:      bool "dos2unix (5.1 kb)"
+//config:      default y
+//config:      help
+//config:      dos2unix is used to convert a text file from DOS format to
+//config:      UNIX format, and vice versa.
+//config:
+//config:config UNIX2DOS
+//config:      bool "unix2dos (5.1 kb)"
+//config:      default y
+//config:      help
+//config:      unix2dos is used to convert a text file from UNIX format to
+//config:      DOS format, and vice versa.
+
+//applet:IF_DOS2UNIX(APPLET_NOEXEC(dos2unix, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, dos2unix))
+//applet:IF_UNIX2DOS(APPLET_NOEXEC(unix2dos, dos2unix, BB_DIR_USR_BIN, BB_SUID_DROP, unix2dos))
+
+//kbuild:lib-$(CONFIG_DOS2UNIX) += dos2unix.o
+//kbuild:lib-$(CONFIG_UNIX2DOS) += dos2unix.o
 
 //usage:#define dos2unix_trivial_usage
 //usage:       "[-ud] [FILE]"
@@ -92,14 +111,16 @@ int dos2unix_main(int argc UNUSED_PARAM, char **argv)
        int o, conv_type;
 
        /* See if we are supposed to be doing dos2unix or unix2dos */
-       conv_type = CT_UNIX2DOS;
-       if (applet_name[0] == 'd') {
+       if (ENABLE_DOS2UNIX
+        && (!ENABLE_UNIX2DOS || applet_name[0] == 'd')
+       ) {
                conv_type = CT_DOS2UNIX;
+       } else {
+               conv_type = CT_UNIX2DOS;
        }
 
        /* -u convert to unix, -d convert to dos */
-       opt_complementary = "u--d:d--u"; /* mutually exclusive */
-       o = getopt32(argv, "du");
+       o = getopt32(argv, "^" "du" "\0" "u--d:d--u"); /* mutually exclusive */
 
        /* Do the conversion requested by an argument else do the default
         * conversion depending on our name.  */