summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2005-08-30 20:26:17 +0000
committerRob Landley2005-08-30 20:26:17 +0000
commitc8b8a2d0cf1e38fc0c8b11b724bbdfcdf62fe65b (patch)
tree5edc3e912ceddaced425d8e026353359d0df6b81
parentc3386a43048907fb07fb28f2723c1efbacf4bd79 (diff)
downloadbusybox-c8b8a2d0cf1e38fc0c8b11b724bbdfcdf62fe65b.zip
busybox-c8b8a2d0cf1e38fc0c8b11b724bbdfcdf62fe65b.tar.gz
Don't comment warnings, _FIX_ warnings. (And putting in #warnings about
other warnings is just gross.) On a side note, while I was there, I made the code slightly smaller.
-rw-r--r--archival/bunzip2.c70
1 files changed, 22 insertions, 48 deletions
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index 5cd013c..740e269 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -2,19 +2,7 @@
* Modified for busybox by Glenn McGrath <bug1@iinet.net.au>
* Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
*
- * 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.
+ * Licensed under GPL v2, see file LICENSE in this tarball for details.
*/
#include <fcntl.h>
@@ -32,61 +20,47 @@
int bunzip2_main(int argc, char **argv)
{
- char *compressed_name;
- /* Note: Ignore the warning about save_name being used uninitialized.
- * That is not the case, but gcc has trouble working that out... */
-#warning The save_name warning is OK, ignore it
- char *save_name;
+ char *filename;
unsigned long opt;
- int status;
- int src_fd;
- int dst_fd;
+ int status, src_fd, dst_fd;
opt = bb_getopt_ulflags(argc, argv, "cf");
- /* if called as bzcat force the stdout flag */
- if (bb_applet_name[2] == 'c') {
- opt |= BUNZIP2_OPT_STDOUT;
- }
-
/* Set input filename and number */
- compressed_name = argv[optind];
- if ((compressed_name) && (compressed_name[0] != '-') && (compressed_name[1] != '\0')) {
+ filename = argv[optind];
+ if ((filename) && (filename[0] != '-') && (filename[1] != '\0')) {
/* Open input file */
- src_fd = bb_xopen(compressed_name, O_RDONLY);
+ src_fd = bb_xopen(filename, O_RDONLY);
} else {
src_fd = STDIN_FILENO;
- opt |= BUNZIP2_OPT_STDOUT;
+ 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 (opt & BUNZIP2_OPT_STDOUT) {
- dst_fd = STDOUT_FILENO;
- } else {
- int len = strlen(compressed_name) - 4;
- if (strcmp(compressed_name + len, ".bz2") != 0) {
+ if (filename) {
+ char *extension=filename+strlen(filename)-4;
+ if (strcmp(extension, ".bz2") != 0) {
bb_error_msg_and_die("Invalid extension");
}
- save_name = bb_xstrndup(compressed_name, len);
- dst_fd = bb_xopen(save_name, O_WRONLY | O_CREAT);
- }
-
+ *extension=0;
+ dst_fd = bb_xopen(filename, O_WRONLY | O_CREAT);
+ } else dst_fd = STDOUT_FILENO;
status = uncompressStream(src_fd, dst_fd);
- if(!(opt & BUNZIP2_OPT_STDOUT)) {
- char *delete_name;
- if (status) {
- delete_name = save_name;
- } else {
- delete_name = compressed_name;
- }
- if (unlink(delete_name) < 0) {
- bb_error_msg_and_die("Couldn't remove %s", delete_name);
+ if(filename) {
+ if (!status) filename[strlen(filename)]='.';
+ if (unlink(filename) < 0) {
+ bb_error_msg_and_die("Couldn't remove %s", filename);
}
}
return status;
}
+/* vi:set ts=4: */