diff options
| author | Rob Landley | 2006-08-03 15:41:12 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-08-03 15:41:12 +0000 |
| commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
| tree | e4a2769349867c441cf2983d83097bb66701a733 /coreutils/catv.c | |
| parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) | |
| download | busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz | |
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 'coreutils/catv.c')
| -rw-r--r-- | coreutils/catv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/coreutils/catv.c b/coreutils/catv.c index dd4aa44..e182039 100644 --- a/coreutils/catv.c +++ b/coreutils/catv.c @@ -11,8 +11,6 @@ * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */ #include "busybox.h" -#include <unistd.h> -#include <fcntl.h> int catv_main(int argc, char **argv) { @@ -28,7 +26,7 @@ int catv_main(int argc, char **argv) // Read from stdin if there's nothing else to do. fd = 0; - if (*argv && 0>(fd = bb_xopen(*argv, O_RDONLY))) retval = EXIT_FAILURE; + if (*argv && 0>(fd = xopen(*argv, O_RDONLY))) retval = EXIT_FAILURE; else for(;;) { int i, res; |