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 /archival/unlzma.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 'archival/unlzma.c')
| -rw-r--r-- | archival/unlzma.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/archival/unlzma.c b/archival/unlzma.c index bb4b9db..fbd207c 100644 --- a/archival/unlzma.c +++ b/archival/unlzma.c @@ -8,12 +8,6 @@ * Licensed under GPL v2, see file LICENSE in this tarball for details. */ -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - #include "busybox.h" #include "unarchive.h" @@ -31,7 +25,7 @@ int unlzma_main(int argc, char **argv) filename = argv[optind]; if ((filename) && (filename[0] != '-') && (filename[1] != '\0')) { /* Open input file */ - src_fd = bb_xopen(filename, O_RDONLY); + src_fd = xopen(filename, O_RDONLY); } else { src_fd = STDIN_FILENO; filename = 0; @@ -50,7 +44,7 @@ int unlzma_main(int argc, char **argv) } xstat(filename, &stat_buf); *extension = 0; - dst_fd = bb_xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode); + dst_fd = xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode); } else dst_fd = STDOUT_FILENO; status = unlzma(src_fd, dst_fd); |