- reuse strings and messages. Saves about 600B

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

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index ecd9e7801dbc8c9486747f9c98fd31af97ccc020..45a660113ce43832b4e2106d69fa82bb2bd5d249 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -31,33 +31,33 @@
 
 struct rpm_lead {
     unsigned char magic[4];
-    u_int8_t major, minor;
-    u_int16_t type;
-    u_int16_t archnum;
+    uint8_t major, minor;
+    uint16_t type;
+    uint16_t archnum;
     char name[66];
-    u_int16_t osnum;
-    u_int16_t signature_type;
+    uint16_t osnum;
+    uint16_t signature_type;
     char reserved[16];
 };
 
 struct rpm_header {
        char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
-       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) */
+       uint8_t version; /* 1 byte version number */
+       uint32_t reserved; /* 4 bytes reserved */
+       uint32_t entries; /* Number of entries in header (4 bytes) */
+       uint32_t size; /* Size of store (4 bytes) */
 };
 
-void skip_header(int rpm_fd)
+static void skip_header(int rpm_fd)
 {
        struct rpm_header header;
 
-       xread_all(rpm_fd, &header, sizeof(struct rpm_header));
+       bb_xread_all(rpm_fd, &header, sizeof(struct rpm_header));
        if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0) {
-               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) {
-               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);
        header.size = ntohl(header.size);
@@ -66,40 +66,39 @@ void skip_header(int rpm_fd)
 }
 
 /* No getopt required */
-extern int rpm2cpio_main(int argc, char **argv)
+int rpm2cpio_main(int argc, char **argv)
 {
        struct rpm_lead lead;
        int rpm_fd;
        unsigned char magic[2];
 
        if (argc == 1) {
-               rpm_fd = fileno(stdin);
+               rpm_fd = STDIN_FILENO;
        } else {
-               rpm_fd = xopen(argv[1], O_RDONLY);
+               rpm_fd = bb_xopen(argv[1], O_RDONLY);
        }
 
-       xread_all(rpm_fd, &lead, sizeof(struct rpm_lead));
+       bb_xread_all(rpm_fd, &lead, sizeof(struct rpm_lead));
        if (strncmp((char *) &lead.magic, RPM_MAGIC, 4) != 0) {
-               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 */
        }
 
        /* Skip the signature header */
        skip_header(rpm_fd);
-       data_align(rpm_fd, lseek(rpm_fd, 0, SEEK_CUR), 8);
+       lseek(rpm_fd, (8 - (lseek(rpm_fd, 0, SEEK_CUR) % 8)) % 8, SEEK_CUR);
 
        /* Skip the main header */
        skip_header(rpm_fd);
-       
-       xread_all(rpm_fd, &magic, 2);
+
+       bb_xread_all(rpm_fd, &magic, 2);
        if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
-               error_msg_and_die("Invalid gzip magic");
+               bb_error_msg_and_die("Invalid gzip magic");
        }
 
        check_header_gzip(rpm_fd);
-       if (inflate(rpm_fd, fileno(stdout)) != 0) {
-               error_msg("Error inflating");
+       if (inflate_gunzip(rpm_fd, STDOUT_FILENO) != 0) {
+               bb_error_msg("Error inflating");
        }
-       check_trailer_gzip(rpm_fd);
 
        close(rpm_fd);