rpm: code shrink. Now uses open_zipped's logic (factored out into setup_unzip_on_fd())

function                                             old     new   delta
setup_unzip_on_fd                                      -      80     +80
open_zipped                                          176     113     -63
rpm_main                                            1672    1355    -317
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/2 up/down: 80/-380)          Total: -300 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 38 insertions, 0 deletions

diff --git a/archival/rpm.h b/archival/rpm.h
new file mode 100644
index 0000000..f7c6fc2
--- /dev/null
+++ b/archival/rpm.h
@@ -0,0 +1,38 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * RPM structs and consts
+ *
+ * Copyright (C) 2001 by Laurence Anderson
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+/* RPM file starts with this struct: */
+struct rpm_lead {
+	uint32_t magic;
+	uint8_t  major, minor;
+	uint16_t type;
+	uint16_t archnum;
+	char     name[66];
+	uint16_t osnum;
+	uint16_t signature_type;
+	char     reserved[16];
+};
+struct BUG_rpm_lead {
+	char bug[sizeof(struct rpm_lead) == 96 ? 1 : -1];
+};
+#define RPM_LEAD_MAGIC      0xedabeedb
+#define RPM_LEAD_MAGIC_STR  "\355\253\356\333"
+
+/* Then follows the header: */
+struct rpm_header {
+	uint32_t magic_and_ver; /* 3 byte magic: 0x8e 0xad 0xe8; 1 byte version: 0x01 */
+	uint32_t reserved;      /* 4 bytes reserved */
+	uint32_t entries;       /* Number of entries in header (4 bytes) */
+	uint32_t size;          /* Size of store (4 bytes) */
+};
+struct BUG_rpm_header {
+	char bug[sizeof(struct rpm_header) == 16 ? 1 : -1];
+};
+#define RPM_HEADER_MAGICnVER  0x8eade801
+#define RPM_HEADER_MAGIC_STR  "\216\255\350"