X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Frpm2cpio.c;h=bb9f69573cb3042020e1ded0bd3e0eb9771c2465;hb=b79db92a21aee4c003f49eb21f1447b79e0e0c1e;hp=45c3ffb1725081ccf996e173c6f471dbb706cef5;hpb=26a0d9a9454ef2075079c74844297e61cd5e0293;p=oweals%2Fbusybox.git

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 45c3ffb17..bb9f69573 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -18,78 +18,90 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-#include "busybox.h"
+#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 "unarchive.h"
 
 #define RPM_MAGIC "\355\253\356\333"
 #define RPM_HEADER_MAGIC "\216\255\350"
 
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-
 struct rpm_lead {
     unsigned char magic[4];
-    u8 major, minor;
-    u16 type;
-    u16 archnum;
+    u_int8_t major, minor;
+    u_int16_t type;
+    u_int16_t archnum;
     char name[66];
-    u16 osnum;
-    u16 signature_type;
+    u_int16_t osnum;
+    u_int16_t signature_type;
     char reserved[16];
 };
 
 struct rpm_header {
 	char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
-	u8 version; /* 1 byte version number */
-	u32 reserved; /* 4 bytes reserved */
-	u32 entries; /* Number of entries in header (4 bytes) */
-	u32 size; /* Size of store (4 bytes) */
+	u_int8_t version; /* 1 byte version number */
+	u_int32_t reserved; /* 4 bytes reserved */
+	u_int32_t entries; /* Number of entries in header (4 bytes) */
+	u_int32_t size; /* Size of store (4 bytes) */
 };
 
-void skip_header(FILE *rpmfile)
+void skip_header(int rpm_fd)
 {
 	struct rpm_header header;
 
-	fread(&header, sizeof(struct rpm_header), 1, rpmfile);
-	if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) error_msg_and_die("Invalid RPM header magic"); /* Invalid magic */
-	if (header.version != 1) error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */
+	bb_xread_all(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 */
+	}
+	if (header.version != 1) {
+		bb_error_msg_and_die("Unsupported RPM header version"); /* This program only supports v1 headers */
+	}
 	header.entries = ntohl(header.entries);
 	header.size = ntohl(header.size);
-	fseek (rpmfile, 16 * header.entries, SEEK_CUR); /* Seek past index entries */
-	fseek (rpmfile, header.size, SEEK_CUR); /* Seek past store */
+	lseek (rpm_fd, 16 * header.entries, SEEK_CUR); /* Seek past index entries */
+	lseek (rpm_fd, header.size, SEEK_CUR); /* Seek past store */
 }
 
 /* No getopt required */
 extern int rpm2cpio_main(int argc, char **argv)
 {
 	struct rpm_lead lead;
-	int gunzip_pid;
-	FILE *rpmfile, *cpiofile;
+	int rpm_fd;
+	unsigned char magic[2];
 
 	if (argc == 1) {
-		rpmfile = stdin;
+		rpm_fd = fileno(stdin);
 	} else {
-		rpmfile = fopen(argv[1], "r");
-	 	if (!rpmfile) perror_msg_and_die("Can't open rpm file");
-		/* set the buffer size */
-		setvbuf(rpmfile, NULL, _IOFBF, 0x8000);
+		rpm_fd = bb_xopen(argv[1], O_RDONLY);
+	}
+
+	bb_xread_all(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 */
 	}
 
-	fread (&lead, sizeof(struct rpm_lead), 1, rpmfile);
-	if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) error_msg_and_die("Invalid RPM magic"); /* Just check the magic, the rest is irrelevant */
 	/* Skip the signature header */
-	skip_header(rpmfile);
-	fseek(rpmfile, (8 - (ftell(rpmfile) % 8)) % 8, SEEK_CUR); /* Pad to 8 byte boundary */
+	skip_header(rpm_fd);
+	lseek(rpm_fd, (8 - (lseek(rpm_fd, 0, SEEK_CUR) % 8)) % 8, SEEK_CUR);
+
 	/* Skip the main header */
-	skip_header(rpmfile);
+	skip_header(rpm_fd);
+	
+	bb_xread_all(rpm_fd, &magic, 2);
+	if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
+		bb_error_msg_and_die("Invalid gzip magic");
+	}
+
+	check_header_gzip(rpm_fd);
+	if (inflate(rpm_fd, fileno(stdout)) != 0) {
+		bb_error_msg("Error inflating");
+	}
+	check_trailer_gzip(rpm_fd);
 
-	cpiofile = gz_open(rpmfile, &gunzip_pid);
+	close(rpm_fd);
 
-	copyfd(fileno(cpiofile), fileno(stdout));
-	gz_close(gunzip_pid);
-	fclose(rpmfile);
 	return 0;
 }