ifupdown: save some 100+ bytes of code in addstr()

[oweals/busybox.git] / archival / bunzip2.c

diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index bedd38c221842118a92fed39f648ff1a86e3f33b..757001fe463586ec5b8411d9761836b897c5bc98 100644 (file)
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -1,29 +1,11 @@
+/* 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>
  *
- *  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 GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "busybox.h"
 #include "unarchive.h"
 
@@ -32,58 +14,51 @@
 
 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... */
-       char *save_name;
-       unsigned long opt;
-       int status;
-       int src_fd;
-       int dst_fd;
+       USE_DESKTOP(long long) int status;
+       char *filename;
+       unsigned opt;
+       int 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;
-       }
+       opt = getopt32(argc, argv, "cf");
 
        /* 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 = 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) || 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.");
+               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) {
-                       bb_error_msg_and_die("Invalid extension");
+       if (filename) {
+               struct stat stat_buf;
+               /* extension = filename+strlen(filename)-4 is buggy:
+                * strlen may be less than 4 */
+               char *extension = strrchr(filename, '.');
+               if (!extension || 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);
-       }
-
+               xstat(filename, &stat_buf);
+               *extension = '\0';
+               dst_fd = xopen3(filename, O_WRONLY | O_CREAT | O_TRUNC,
+                               stat_buf.st_mode);
+       } 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 >= 0) filename[strlen(filename)] = '.';
+               if (unlink(filename) < 0) {
+                       bb_error_msg_and_die("cannot remove %s", filename);
                }
        }