Applied patch from Gennady Feldman to use single-thread instead of forking.

[oweals/busybox.git] / rpmunpack.c

diff --git a/rpmunpack.c b/rpmunpack.c
index 2178a247dd72a27ecc611d2931b8050c353be833..12e9c71de33e0fd21d008dfec3f24f0add9d3083 100644 (file)
--- a/rpmunpack.c
+++ b/rpmunpack.c
@@ -13,13 +13,16 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
  
-#include "busybox.h" 
 #include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include "busybox.h" 
 
 /*
  * Some general definitions
  */
-#define BUFSIZE                512
+
 #define RPM_MAGIC      "\355\253\356\333"
 #define GZ_MAGIC_1     '\037'
 #define GZ_MAGIC_2     '\213'
@@ -27,23 +30,21 @@
 /*
  * Global variables
  */
-static char buffer[BUFSIZE];
 static char *progname;
 static int infile, outfile;
 
 /*
  * Read a specified number of bytes from input file
  */
-static void myread(int num)
+static void myread(int num, char *buffer)
 {
   int err;
 
   if ((err = read(infile, buffer, num)) != num) {
        if (err < 0)
-               perror(progname);
+               perror_msg_and_die(progname);
        else
-               fprintf(stderr, "Unexpected end of input file!\n");
-       exit(1);
+               error_msg_and_die("Unexpected end of input file!");
   }
 }
 
@@ -53,6 +54,7 @@ static void myread(int num)
 int rpmunpack_main(int argc, char **argv)
 {
   int len, status = 0;
+  RESERVE_BB_BUFFER(buffer, BUFSIZ);
 
   /* Get our own program name */
   if ((progname = strrchr(argv[0], '/')) == NULL)
@@ -62,35 +64,31 @@ int rpmunpack_main(int argc, char **argv)
 
   /* Check for command line parameters */
        if (argc>=2 && *argv[1]=='-') {
-           usage(rpmunpack_usage);
+           show_usage();
        }
 
   /* Open input file */
   if (argc == 1)
        infile = STDIN_FILENO;
-  else if ((infile = open(argv[1], O_RDONLY)) < 0) {
-       perror(progname);
-       exit(1);
-  }
+  else if ((infile = open(argv[1], O_RDONLY)) < 0)
+       perror_msg_and_die("%s", argv[1]);
 
   /* Read magic ID and output filename */
-  myread(4);
+  myread(4, buffer);
   if (strncmp(buffer, RPM_MAGIC, 4)) {
        fprintf(stderr, "Input file is not in RPM format!\n");
        exit(1);
   }
-  myread(6);           /* Skip flags */
-  myread(64);
+  myread(6, buffer);           /* Skip flags */
+  myread(64, buffer);
   buffer[64] = '\0';
 
   /* Open output file */
   strcat(buffer, ".cpio.gz");
   if (infile == STDIN_FILENO)
        outfile = STDOUT_FILENO;
-  else if ((outfile = open(buffer, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0) {
-       perror(progname);
-       exit(1);
-  }
+  else if ((outfile = open(buffer, O_WRONLY | O_CREAT | O_TRUNC, 0644)) < 0)
+         perror_msg_and_die("%s", buffer);
 
   /*
    * Now search for the GZIP signature. This is rather awkward, but I don't
@@ -102,9 +100,9 @@ int rpmunpack_main(int argc, char **argv)
    * never appears before offset 0x200, so we skip these first couple of
    * bytes to make the signature scan a little more reliable.
    */
-  myread(0x200 - 74);
+  myread(0x200 - 74, buffer);
   while (status < 2) {
-       myread(1);
+       myread(1, buffer);
        if (status == 0 && buffer[0] == GZ_MAGIC_1)
                status++;
        else if (status == 1 && buffer[0] == GZ_MAGIC_2)
@@ -114,23 +112,15 @@ int rpmunpack_main(int argc, char **argv)
   }
   buffer[0] = GZ_MAGIC_1;
   buffer[1] = GZ_MAGIC_2;
-  if (write(outfile, buffer, 2) < 0) {
-       perror(progname);
-       exit(1);
-  }
+  if (write(outfile, buffer, 2) < 0)
+       perror_msg_and_die("write");
 
   /* Now simply copy the GZIP archive into the output file */
-  while ((len = read(infile, buffer, BUFSIZE)) > 0) {
-       if (write(outfile, buffer, len) < 0) {
-               perror(progname);
-               exit(1);
-       }
-  }
-  if (len < 0) {
-       perror(progname);
-       exit(1);
+  while ((len = read(infile, buffer, BUFSIZ)) > 0) {
+       if (write(outfile, buffer, len) < 0)
+               perror_msg_and_die("write");
   }
-  close(outfile);
-  close(infile);
-  exit(0);
+  if (len < 0)
+    perror_msg_and_die("read");
+  return EXIT_SUCCESS;
 }