Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/dos2unix.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/dos2unix.c (modified) (3 diffs)

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

@@ -42 +42 @@
 {
     FILE *in, *out;
-    int i;
+    int ch;
     char *temp_fn = temp_fn; /* for compiler */
     char *resolved_fn = resolved_fn;
@@ -50 +50 @@
     if (fn != NULL) {
         struct stat st;
+        int fd;
 
         resolved_fn = xmalloc_follow_symlinks(fn);
@@ -55 +56 @@
             bb_simple_perror_msg_and_die(fn);
         in = xfopen_for_read(resolved_fn);
-        fstat(fileno(in), &st);
+        xfstat(fileno(in), &st, resolved_fn);
 
         temp_fn = xasprintf("%sXXXXXX", resolved_fn);
-        i = xmkstemp(temp_fn);
-        if (fchmod(i, st.st_mode) == -1)
+        fd = xmkstemp(temp_fn);
+        if (fchmod(fd, st.st_mode) == -1)
             bb_simple_perror_msg_and_die(temp_fn);
+        fchown(fd, st.st_uid, st.st_gid);
 
-        out = xfdopen_for_write(i);
+        out = xfdopen_for_write(fd);
     }
 
-    while ((i = fgetc(in)) != EOF) {
-        if (i == '\r')
+    while ((ch = fgetc(in)) != EOF) {
+        if (ch == '\r')
             continue;
-        if (i == '\n')
+        if (ch == '\n')
             if (conv_type == CT_UNIX2DOS)
                 fputc('\r', out);
-        fputc(i, out);
+        fputc(ch, out);
     }