Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/rx.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/miscutils/rx.c (modified) (7 diffs)

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

@@ -2 +2 @@
 /*-------------------------------------------------------------------------
  * Filename:      xmodem.c
- * Version:       $Id: rx.c,v 1.2 2004/03/15 08:28:46 andersen Exp $
  * Copyright:     Copyright (C) 2001, Hewlett-Packard Company
  * Author:        Christopher Hoover <ch@hpl.hp.com>
@@ -21 +20 @@
  */
 
-#include "busybox.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <termios.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
+#include "libbb.h"
 
 #define SOH 0x01
@@ -57 +44 @@
 #define MAXERRORS 10
 
-static int read_byte(int fd, unsigned int timeout) {
+static int read_byte(int fd, unsigned int timeout)
+{
     char buf[1];
     int n;
@@ -213 +201 @@
         length += blockLength;
 
-        if (bb_full_write(filefd, blockBuf, blockLength) < 0) {
+        if (full_write(filefd, blockBuf, blockLength) < 0) {
             note_error("write to file failed: %m");
             goto fatal;
@@ -262 +250 @@
 }
 
+int rx_main(int argc, char **argv);
 int rx_main(int argc, char **argv)
 {
@@ -275 +264 @@
 
     fn = argv[1];
-    ttyfd = bb_xopen3(CURRENT_TTY, O_RDWR, 0);
-    filefd = bb_xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666);
+    ttyfd = xopen(CURRENT_TTY, O_RDWR);
+    filefd = xopen(fn, O_RDWR|O_CREAT|O_TRUNC);
 
     if (tcgetattr(ttyfd, &tty) < 0)
-            bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]);
+            bb_perror_msg_and_die("tcgetattr");
 
     orig_tty = tty;
@@ -297 +286 @@
 
     if (n < 0)
-            bb_error_msg_and_die("\n%s: receive failed:\n  %s\n",
-                               argv[0], error_buf);
-
-    bb_fflush_stdout_and_exit(EXIT_SUCCESS);
-}
+        bb_error_msg_and_die("\nreceive failed:\n  %s", error_buf);
+
+    fflush_stdout_and_exit(EXIT_SUCCESS);
+}