aboutsummaryrefslogtreecommitdiff
path: root/miscutils/rx.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
committerRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
commitd921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch)
treee4a2769349867c441cf2983d83097bb66701a733 /miscutils/rx.c
parent6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff)
downloadbusybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.bz2
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip
Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.)
Diffstat (limited to 'miscutils/rx.c')
-rw-r--r--miscutils/rx.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 41673b60e..4cc4913e6 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -21,18 +21,6 @@
21 */ 21 */
22 22
23#include "busybox.h" 23#include "busybox.h"
24#include <stdlib.h>
25#include <stdarg.h>
26#include <stdio.h>
27#include <unistd.h>
28#include <errno.h>
29#include <termios.h>
30#include <signal.h>
31#include <sys/types.h>
32#include <sys/stat.h>
33#include <fcntl.h>
34#include <string.h>
35
36 24
37#define SOH 0x01 25#define SOH 0x01
38#define STX 0x02 26#define STX 0x02
@@ -274,8 +262,8 @@ int rx_main(int argc, char **argv)
274 bb_show_usage(); 262 bb_show_usage();
275 263
276 fn = argv[1]; 264 fn = argv[1];
277 ttyfd = bb_xopen3(CURRENT_TTY, O_RDWR, 0); 265 ttyfd = xopen3(CURRENT_TTY, O_RDWR, 0);
278 filefd = bb_xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666); 266 filefd = xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666);
279 267
280 if (tcgetattr(ttyfd, &tty) < 0) 268 if (tcgetattr(ttyfd, &tty) < 0)
281 bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]); 269 bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]);