Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/archival/rpm2cpio.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/archival/rpm2cpio.c (modified) (5 diffs)

branches/2.2.5/mindi-busybox/archival/rpm2cpio.c

@@ -5 +5 @@
  * Copyright (C) 2001 by Laurence Anderson
  *
- * 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 <sys/types.h>
-#include <netinet/in.h> /* For ntohl & htonl function */
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
@@ -53 +36 @@
     struct rpm_header header;
 
-    bb_xread_all(rpm_fd, &header, sizeof(struct rpm_header));
+    xread(rpm_fd, &header, sizeof(struct rpm_header));
     if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) {
-        bb_error_msg_and_die("Invalid RPM header magic"); /* Invalid magic */
+        bb_error_msg_and_die("invalid RPM header magic"); /* Invalid magic */
     }
     if (header.version != 1) {
-        bb_error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */
+        bb_error_msg_and_die("unsupported RPM header version"); /* This program only supports v1 headers */
     }
     header.entries = ntohl(header.entries);
@@ -67 +50 @@
 
 /* No getopt required */
+int rpm2cpio_main(int argc, char **argv);
 int rpm2cpio_main(int argc, char **argv)
 {
@@ -76 +60 @@
         rpm_fd = STDIN_FILENO;
     } else {
-        rpm_fd = bb_xopen(argv[1], O_RDONLY);
+        rpm_fd = xopen(argv[1], O_RDONLY);
     }
 
-    bb_xread_all(rpm_fd, &lead, sizeof(struct rpm_lead));
+    xread(rpm_fd, &lead, sizeof(struct rpm_lead));
     if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) {
-        bb_error_msg_and_die("Invalid RPM magic"); /* Just check the magic, the rest is irrelevant */
+        bb_error_msg_and_die("invalid RPM magic"); /* Just check the magic, the rest is irrelevant */
     }
 
@@ -91 +75 @@
     skip_header(rpm_fd);
 
-    bb_xread_all(rpm_fd, &magic, 2);
+    xread(rpm_fd, &magic, 2);
     if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
-        bb_error_msg_and_die("Invalid gzip magic");
+        bb_error_msg_and_die("invalid gzip magic");
     }
 
-    check_header_gzip(rpm_fd);
-    if (inflate_gunzip(rpm_fd, STDOUT_FILENO) != 0) {
-        bb_error_msg("Error inflating");
+    check_header_gzip_or_die(rpm_fd);
+    if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) {
+        bb_error_msg("error inflating");
     }