d921b2ecc0
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.)
62 lines
1.6 KiB
C
62 lines
1.6 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Modified for busybox by Glenn McGrath <bug1@iinet.net.au>
|
|
* Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*/
|
|
|
|
#include "busybox.h"
|
|
#include "unarchive.h"
|
|
|
|
#define BUNZIP2_OPT_STDOUT 1
|
|
#define BUNZIP2_OPT_FORCE 2
|
|
|
|
int bunzip2_main(int argc, char **argv)
|
|
{
|
|
char *filename;
|
|
unsigned long opt;
|
|
int status, src_fd, dst_fd;
|
|
|
|
opt = bb_getopt_ulflags(argc, argv, "cf");
|
|
|
|
/* Set input filename and number */
|
|
filename = argv[optind];
|
|
if ((filename) && (filename[0] != '-') && (filename[1] != '\0')) {
|
|
/* Open input file */
|
|
src_fd = xopen(filename, O_RDONLY);
|
|
} else {
|
|
src_fd = STDIN_FILENO;
|
|
filename = 0;
|
|
}
|
|
|
|
/* if called as bzcat force the stdout flag */
|
|
if ((opt & BUNZIP2_OPT_STDOUT) || bb_applet_name[2] == 'c')
|
|
filename = 0;
|
|
|
|
/* Check that the input is sane. */
|
|
if (isatty(src_fd) && (opt & BUNZIP2_OPT_FORCE) == 0) {
|
|
bb_error_msg_and_die("Compressed data not read from terminal. Use -f to force it.");
|
|
}
|
|
|
|
if (filename) {
|
|
struct stat stat_buf;
|
|
char *extension=filename+strlen(filename)-4;
|
|
if (strcmp(extension, ".bz2") != 0) {
|
|
bb_error_msg_and_die("Invalid extension");
|
|
}
|
|
xstat(filename, &stat_buf);
|
|
*extension=0;
|
|
dst_fd = xopen3(filename, O_WRONLY | O_CREAT, stat_buf.st_mode);
|
|
} else dst_fd = STDOUT_FILENO;
|
|
status = uncompressStream(src_fd, dst_fd);
|
|
if(filename) {
|
|
if (!status) filename[strlen(filename)]='.';
|
|
if (unlink(filename) < 0) {
|
|
bb_error_msg_and_die("Couldn't remove %s", filename);
|
|
}
|
|
}
|
|
|
|
return status;
|
|
}
|