typo fix in a comment in a testcase. oh well...

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

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 566a9f21366f89e7323d053d77021503c3f5aadf..5403aee0221eefacd3b39ef80c8cc8bf44aac333 100644 (file)
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -23,7 +23,7 @@ struct rpm_lead {
        char reserved[16];
 };
 
-#define RPM_HEADER_VERnMAGIC 0x8eade801
+#define RPM_HEADER_MAGICnVER 0x8eade801
 #define RPM_HEADER_MAGIC_STR "\216\255\350"
 
 struct rpm_header {
@@ -33,9 +33,12 @@ struct rpm_header {
        uint32_t size; /* Size of store (4 bytes) */
 };
 
-static off_t skip_header(int rpm_fd)
+enum { rpm_fd = STDIN_FILENO };
+
+static unsigned skip_header(void)
 {
        struct rpm_header header;
+       unsigned len;
 
        xread(rpm_fd, &header, sizeof(header));
 //     if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC_STR, 3) != 0) {
@@ -44,14 +47,16 @@ static off_t skip_header(int rpm_fd)
 //     if (header.version != 1) {
 //             bb_error_msg_and_die("unsupported RPM header version");
 //     }
-       if (header.magic_and_ver != htonl(RPM_HEADER_VERnMAGIC)) {
+       if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER)) {
                bb_error_msg_and_die("invalid RPM header magic or unsupported version");
-               // ": %x != %x", header.magic_and_ver, htonl(RPM_HEADER_VERnMAGIC));
+               // ": %x != %x", header.magic_and_ver, htonl(RPM_HEADER_MAGICnVER));
        }
-       /* Seek past index entries */
-       lseek(rpm_fd, 16 * ntohl(header.entries), SEEK_CUR);
-       /* Seek past store */
-       return lseek(rpm_fd, ntohl(header.size), SEEK_CUR);
+
+       /* Seek past index entries, and past store */
+       len = 16 * ntohl(header.entries) + ntohl(header.size);
+       seek_by_jump(rpm_fd, len);
+
+       return sizeof(header) + len;
 }
 
 /* No getopt required */
@@ -59,15 +64,12 @@ int rpm2cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
 {
        struct rpm_lead lead;
-       int rpm_fd;
-       off_t pos;
+       unsigned pos;
        unsigned char magic[2];
        IF_DESKTOP(long long) int FAST_FUNC (*unpack)(int src_fd, int dst_fd);
 
-       if (!argv[1]) {
-               rpm_fd = STDIN_FILENO;
-       } else {
-               rpm_fd = xopen(argv[1], O_RDONLY);
+       if (argv[1]) {
+               xmove_fd(xopen(argv[1], O_RDONLY), rpm_fd);
        }
        xread(rpm_fd, &lead, sizeof(lead));
 
@@ -77,11 +79,11 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
        }
 
        /* Skip the signature header, align to 8 bytes */
-       pos = skip_header(rpm_fd);
-       lseek(rpm_fd, (8 - (unsigned)pos) & 7, SEEK_CUR);
+       pos = skip_header();
+       seek_by_jump(rpm_fd, (8 - pos) & 7);
 
        /* Skip the main header */
-       skip_header(rpm_fd);
+       skip_header();
 
        xread(rpm_fd, &magic, 2);
        unpack = unpack_gz_stream;