From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/archival/bunzip2.c | 103 -------------------------- 1 file changed, 103 deletions(-) delete mode 100644 release/src/router/busybox/archival/bunzip2.c (limited to 'release/src/router/busybox/archival/bunzip2.c') diff --git a/release/src/router/busybox/archival/bunzip2.c b/release/src/router/busybox/archival/bunzip2.c deleted file mode 100644 index eb5238cd..00000000 --- a/release/src/router/busybox/archival/bunzip2.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Modified for busybox by Glenn McGrath - * Added support output to stdout by Thomas Lundquist - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include -#include -#include -#include -#include -#include - -#include "busybox.h" -#include "unarchive.h" - -int bunzip2_main(int argc, char **argv) -{ - const int bunzip_to_stdout = 1; - const int bunzip_force = 2; - int flags = 0; - int opt = 0; - int status; - - int src_fd; - int dst_fd; - char *save_name = NULL; - char *delete_name = NULL; - - /* if called as bzcat */ - if (strcmp(bb_applet_name, "bzcat") == 0) - flags |= bunzip_to_stdout; - - while ((opt = getopt(argc, argv, "cfh")) != -1) { - switch (opt) { - case 'c': - flags |= bunzip_to_stdout; - break; - case 'f': - flags |= bunzip_force; - break; - case 'h': - default: - bb_show_usage(); /* exit's inside usage */ - } - } - - /* Set input filename and number */ - if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) { - flags |= bunzip_to_stdout; - src_fd = fileno(stdin); - } else { - /* Open input file */ - src_fd = bb_xopen(argv[optind], O_RDONLY); - - save_name = bb_xstrdup(argv[optind]); - if (strcmp(save_name + strlen(save_name) - 4, ".bz2") != 0) - bb_error_msg_and_die("Invalid extension"); - save_name[strlen(save_name) - 4] = '\0'; - } - - /* Check that the input is sane. */ - if (isatty(src_fd) && (flags & bunzip_force) == 0) { - bb_error_msg_and_die("compressed data not read from terminal. Use -f to force it."); - } - - if (flags & bunzip_to_stdout) { - dst_fd = fileno(stdout); - } else { - dst_fd = bb_xopen(save_name, O_WRONLY | O_CREAT); - } - - if (uncompressStream(src_fd, dst_fd)) { - if (!(flags & bunzip_to_stdout)) { - delete_name = argv[optind]; - } - status = EXIT_SUCCESS; - } else { - if (!(flags & bunzip_to_stdout)) { - delete_name = save_name; - } - status = EXIT_FAILURE; - } - - if ((delete_name) && (unlink(delete_name) < 0)) { - bb_error_msg_and_die("Couldn't remove %s", delete_name); - } - - return status; -} -- cgit v1.2.3-54-g00ecf