Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/miscutils/rx.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/miscutils/rx.c (modified) (6 diffs)

branches/3.2/mindi-busybox/miscutils/rx.c

@@ -15 +15 @@
  * This was originally written for blob and then adapted for busybox.
  */
+
+//usage:#define rx_trivial_usage
+//usage:       "FILE"
+//usage:#define rx_full_usage "\n\n"
+//usage:       "Receive a file using the xmodem protocol"
+//usage:
+//usage:#define rx_example_usage
+//usage:       "$ rx /tmp/foo\n"
 
 #include "libbb.h"
@@ -101 +109 @@
         }
         /* Write previously received block */
-        if (blockLength) {
-            errno = 0;
-            if (full_write(file_fd, blockBuf, blockLength) != blockLength) {
-                bb_perror_msg("can't write to file");
-                goto fatal;
-            }
+        errno = 0;
+        if (full_write(file_fd, blockBuf, blockLength) != blockLength) {
+            bb_perror_msg(bb_msg_write_error);
+            goto fatal;
         }
 
@@ -148 +154 @@
         }
 
+        cksum_or_crc = read_byte(TIMEOUT);
+        if (cksum_or_crc < 0)
+            goto timeout;
         if (do_crc) {
-            cksum_or_crc = read_byte(TIMEOUT);
-            if (cksum_or_crc < 0)
-                goto timeout;
             cksum_or_crc = (cksum_or_crc << 8) | read_byte(TIMEOUT);
-            if (cksum_or_crc < 0)
-                goto timeout;
-        } else {
-            cksum_or_crc = read_byte(TIMEOUT);
             if (cksum_or_crc < 0)
                 goto timeout;
@@ -165 +167 @@
             /* this also ignores the initial block 0 which is */
             /* meta data. */
+            blockLength = 0;
             goto next;
         }
@@ -191 +194 @@
         if (cksum_or_crc != expected) {
             bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x"
-                               : "checksum error, expected 0x%02x, got 0x%02x",
-                    expected, cksum_or_crc);
+                    : "checksum error, expected 0x%02x, got 0x%02x",
+                expected, cksum_or_crc);
             goto error;
         }
@@ -205 +208 @@
  error:
  timeout:
+        blockLength = 0;
         errors++;
         if (errors == MAXERRORS) {