Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/dos2unix.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/dos2unix.c (modified) (5 diffs)

branches/2.2.9/mindi-busybox/coreutils/dos2unix.c

@@ -10 +10 @@
  * dos2unix filters reading input from stdin and writing output to stdout.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 
 #include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
 
 enum {
@@ -21 +23 @@
 
 /* if fn is NULL then input is stdin and output is stdout */
-static int convert(char *fn, int conv_type)
+static void convert(char *fn, int conv_type)
 {
     FILE *in, *out;
     int i;
-#define name_buf bb_common_bufsiz1
+    char *temp_fn = temp_fn; /* for compiler */
+    char *resolved_fn = resolved_fn;
 
     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.
-         */
-        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(name_buf);
-            return -2;
-        }
+        struct stat st;
+
+        resolved_fn = xmalloc_follow_symlinks(fn);
+        if (resolved_fn == NULL)
+            bb_simple_perror_msg_and_die(fn);
+        in = xfopen_for_read(resolved_fn);
+        fstat(fileno(in), &st);
+
+        temp_fn = xasprintf("%sXXXXXX", resolved_fn);
+        i = xmkstemp(temp_fn);
+        if (fchmod(i, st.st_mode) == -1)
+            bb_simple_perror_msg_and_die(temp_fn);
+
+        out = xfdopen_for_write(i);
     }
 
@@ -52 +52 @@
         if (i == '\r')
             continue;
-        if (i == '\n') {
+        if (i == '\n')
             if (conv_type == CT_UNIX2DOS)
                 fputc('\r', out);
-            fputc('\n', out);
-            continue;
-        }
         fputc(i, out);
     }
@@ -63 +60 @@
     if (fn != NULL) {
         if (fclose(in) < 0 || fclose(out) < 0) {
-            bb_perror_nomsg();
-            remove(name_buf);
-            return -2;
+            unlink(temp_fn);
+            bb_perror_nomsg_and_die();
         }
-        /* 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(name_buf, fn) < 0) {
-            bb_perror_msg("cannot rename '%s' as '%s'", name_buf, fn);
-            return -1;
-        }
+        xrename(temp_fn, resolved_fn);
+        free(temp_fn);
+        free(resolved_fn);
     }
-
-    return 0;
 }
 
-int dos2unix_main(int argc, char **argv);
-int dos2unix_main(int argc, char **argv)
+int dos2unix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+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') {
-        conv_type = CT_DOS2UNIX;    /* 2 */
-    } else {
-        conv_type = CT_UNIX2DOS;    /* 1 */
+        conv_type = CT_DOS2UNIX;
     }
 
@@ -100 +89 @@
         conv_type = o;
 
+    argv += optind;
     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);
+        convert(*argv, conv_type);
+    } while (*argv && *++argv);
 
-    return o;
+    return 0;
 }