whitespace fixes

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

diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index a8038a6dd3aa92ecefe544a6cddf17c69dd776ef..295be290945a3655126a18e247754683d9fa11c8 100644 (file)
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -12,51 +12,47 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
 */
 
-#include "busybox.h"
+#include "libbb.h"
 
-enum ConvType {
+enum {
        CT_UNIX2DOS = 1,
        CT_DOS2UNIX
-} ConvType;
+};
 
 /* if fn is NULL then input is stdin and output is stdout */
-static int convert(char *fn)
+static int convert(char *fn, int conv_type)
 {
        FILE *in, *out;
        int i;
+#define name_buf bb_common_bufsiz1
 
+       in = stdin;
+       out = stdout;
        if (fn != NULL) {
                in = xfopen(fn, "rw");
                /*
                   The file is then created with mode read/write and
                   permissions 0666 for glibc 2.0.6 and earlier or
-                  0600  for glibc  2.0.7 and  later.
+                  0600 for glibc 2.0.7 and later.
                 */
-               snprintf(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), "%sXXXXXX", fn);
-               /*
-                  sizeof bb_common_bufsiz1 is 4096, so it should be big enough to
-                  hold the full path.  However if the output is truncated the
-                  subsequent call to mkstemp would fail.
-                */
-               if ((i = mkstemp(&bb_common_bufsiz1[0])) == -1
-                       || chmod(bb_common_bufsiz1, 0600) == -1) {
+               snprintf(name_buf, sizeof(name_buf), "%sXXXXXX", fn);
+               i = mkstemp(&name_buf[0]);
+               if (i == -1 || chmod(name_buf, 0600) == -1) {
                        bb_perror_nomsg_and_die();
                }
                out = fdopen(i, "w+");
                if (!out) {
                        close(i);
-                       remove(bb_common_bufsiz1);
+                       remove(name_buf);
+                       return -2;
                }
-       } else {
-               in = stdin;
-               out = stdout;
        }
 
        while ((i = fgetc(in)) != EOF) {
                if (i == '\r')
                        continue;
                if (i == '\n') {
-                       if (ConvType == CT_UNIX2DOS)
+                       if (conv_type == CT_UNIX2DOS)
                                fputc('\r', out);
                        fputc('\n', out);
                        continue;
@@ -67,14 +63,14 @@ static int convert(char *fn)
        if (fn != NULL) {
                if (fclose(in) < 0 || fclose(out) < 0) {
                        bb_perror_nomsg();
-                       remove(bb_common_bufsiz1);
+                       remove(name_buf);
                        return -2;
                }
                /* Assume they are both on the same filesystem (which
                 * should be true since we put them into the same directory
                 * so we _should_ be ok, but you never know... */
-               if (rename(bb_common_bufsiz1, fn) < 0) {
-                       bb_perror_msg("cannot rename '%s' as '%s'", bb_common_bufsiz1, fn);
+               if (rename(name_buf, fn) < 0) {
+                       bb_perror_msg("cannot rename '%s' as '%s'", name_buf, fn);
                        return -1;
                }
        }
@@ -82,34 +78,34 @@ static int convert(char *fn)
        return 0;
 }
 
-int dos2unix_main(int argc, char *argv[])
+int dos2unix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dos2unix_main(int argc, char **argv)
 {
-       int o;
+       int o, conv_type;
 
        /* See if we are supposed to be doing dos2unix or unix2dos */
-       if (bb_applet_name[0] == 'd') {
-               ConvType = CT_DOS2UNIX; /*2 */
+       if (applet_name[0] == 'd') {
+               conv_type = CT_DOS2UNIX;        /* 2 */
        } else {
-               ConvType = CT_UNIX2DOS; /*1 */
+               conv_type = CT_UNIX2DOS;        /* 1 */
        }
-       /* -u and -d are mutally exclusive */
-       opt_complementary = "?:u--d:d--u";
-       /* process parameters */
-       /* -u convert to unix */
-       /* -d convert to dos  */
-       o = getopt32(argc, argv, "du");
+
+       /* -u convert to unix, -d convert to dos */
+       opt_complementary = "u--d:d--u"; /* mutually exclusive */
+       o = getopt32(argv, "du");
 
        /* Do the conversion requested by an argument else do the default
         * conversion depending on our name.  */
        if (o)
-               ConvType = o;
+               conv_type = o;
 
-       if (optind < argc) {
-               while (optind < argc)
-                       if ((o = convert(argv[optind++])) < 0)
-                               break;
-       } else
-               o = convert(NULL);
+       do {
+               /* might be convert(NULL) if there is no filename given */
+               o = convert(argv[optind], conv_type);
+               if (o < 0)
+                       break;
+               optind++;
+       } while (optind < argc);
 
        return o;
 }