Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/archival/rpm.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/archival/rpm.c (modified) (12 diffs)

branches/2.2.9/mindi-busybox/archival/rpm.c

@@ -5 +5 @@
  * Copyright (C) 2001,2002 by Laurence Anderson
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
-#include "unarchive.h"
-
-#define RPM_HEADER_MAGIC        "\216\255\350"
+#include "archive.h"
+#include "rpm.h"
+
 #define RPM_CHAR_TYPE           1
 #define RPM_INT8_TYPE           2
@@ -47 +47 @@
 #define TAG_BASENAMES           1117
 #define TAG_DIRNAMES            1118
+
 #define RPMFILE_CONFIG          (1 << 0)
 #define RPMFILE_DOC             (1 << 1)
@@ -71 +72 @@
 static int tagcount;
 
-static void extract_cpio_gz(int fd);
+static void extract_cpio(int fd, const char *source_rpm);
 static rpm_index **rpm_gettags(int fd, int *num_tags);
 static int bsearch_rpmtag(const void *key, const void *item);
@@ -81 +82 @@
 static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref));
 
-int rpm_main(int argc, char **argv);
+int rpm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rpm_main(int argc, char **argv)
 {
@@ -116 +117 @@
     }
     argv += optind;
-    argc -= optind;
-    if (!argc) bb_show_usage();
+    //argc -= optind;
+    if (!argv[0]) {
+        bb_show_usage();
+    }
 
     while (*argv) {
+        const char *source_rpm;
+
         rpm_fd = xopen(*argv++, O_RDONLY);
         mytags = rpm_gettags(rpm_fd, &tagcount);
@@ -128 +133 @@
         map = mmap(0, offset > pagesize ? (offset + offset % pagesize) : pagesize, PROT_READ, MAP_PRIVATE, rpm_fd, 0);
 
+        source_rpm = rpm_getstr(TAG_SOURCERPM, 0);
+
         if (func & rpm_install) {
             /* Backup any config files */
             loop_through_files(TAG_BASENAMES, fileaction_dobackup);
             /* Extact the archive */
-            extract_cpio_gz(rpm_fd);
+            extract_cpio(rpm_fd, source_rpm);
             /* Set the correct file uid/gid's */
             loop_through_files(TAG_BASENAMES, fileaction_setowngrp);
@@ -144 +151 @@
                 /* Do the nice printout */
                 time_t bdate_time;
-                struct tm *bdate;
+                struct tm *bdate_ptm;
                 char bdatestring[50];
-                printf("Name        : %-29sRelocations: %s\n", rpm_getstr(TAG_NAME, 0), rpm_getstr(TAG_PREFIXS, 0) ? rpm_getstr(TAG_PREFIXS, 0) : "(not relocateable)");
-                printf("Version     : %-34sVendor: %s\n", rpm_getstr(TAG_VERSION, 0), rpm_getstr(TAG_VENDOR, 0) ? rpm_getstr(TAG_VENDOR, 0) : "(none)");
+                const char *p;
+
+                p = rpm_getstr(TAG_PREFIXS, 0);
+                if (!p) p = "(not relocateable)";
+                printf("Name        : %-29sRelocations: %s\n", rpm_getstr(TAG_NAME, 0), p);
+                p = rpm_getstr(TAG_VENDOR, 0);
+                if (!p) p = "(none)";
+                printf("Version     : %-34sVendor: %s\n", rpm_getstr(TAG_VERSION, 0), p);
                 bdate_time = rpm_getint(TAG_BUILDTIME, 0);
-                bdate = localtime((time_t *) &bdate_time);
-                strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate);
+                bdate_ptm = localtime(&bdate_time);
+                strftime(bdatestring, 50, "%a %d %b %Y %T %Z", bdate_ptm);
                 printf("Release     : %-30sBuild Date: %s\n", rpm_getstr(TAG_RELEASE, 0), bdatestring);
                 printf("Install date: %-30sBuild Host: %s\n", "(not installed)", rpm_getstr(TAG_BUILDHOST, 0));
-                printf("Group       : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), rpm_getstr(TAG_SOURCERPM, 0));
+                printf("Group       : %-30sSource RPM: %s\n", rpm_getstr(TAG_GROUP, 0), source_rpm);
                 printf("Size        : %-33dLicense: %s\n", rpm_getint(TAG_SIZE, 0), rpm_getstr(TAG_LICENSE, 0));
                 printf("URL         : %s\n", rpm_getstr(TAG_URL, 0));
@@ -186 +199 @@
 }
 
-static void extract_cpio_gz(int fd)
+static void extract_cpio(int fd, const char *source_rpm)
 {
     archive_handle_t *archive_handle;
-    unsigned char magic[2];
-#if BB_MMU
-    USE_DESKTOP(long long) int (*xformer)(int src_fd, int dst_fd);
-    enum { xformer_prog = 0 };
-#else
-    enum { xformer = 0 };
-    const char *xformer_prog;
-#endif
+
+    if (source_rpm != NULL) {
+        /* Binary rpm (it was built from some SRPM), install to root */
+        xchdir("/");
+    } /* else: SRPM, install to current dir */
 
     /* Initialize */
     archive_handle = init_handle();
     archive_handle->seek = seek_by_read;
-    //archive_handle->action_header = header_list;
     archive_handle->action_data = data_extract_all;
-    archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
-    archive_handle->flags |= ARCHIVE_CREATE_LEADING_DIRS;
+#if 0 /* For testing (rpm -i only lists the files in internal cpio): */
+    archive_handle->action_header = header_list;
+    archive_handle->action_data = data_skip;
+#endif
+    archive_handle->ah_flags = ARCHIVE_RESTORE_DATE | ARCHIVE_CREATE_LEADING_DIRS
+        /* compat: overwrite existing files.
+         * try "rpm -i foo.src.rpm" few times in a row -
+         * standard rpm will not complain.
+         * (TODO? real rpm creates "file;1234" and then renames it) */
+        | ARCHIVE_UNLINK_OLD;
     archive_handle->src_fd = fd;
-    archive_handle->offset = 0;
-
-    xread(archive_handle->src_fd, &magic, 2);
-#if BB_MMU
-    xformer = unpack_gz_stream;
-#else
-    xformer_prog = "gunzip";
-#endif
-    if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) {
-        if (ENABLE_FEATURE_RPM_BZ2
-         && (magic[0] == 0x42) && (magic[1] == 0x5a)) {
-#if BB_MMU
-            xformer = unpack_bz2_stream;
-#else
-            xformer_prog = "bunzip2";
-#endif
-    /* We can do better, need modifying unpack_bz2_stream to not require
-     * first 2 bytes. Not very hard to do... I mean, TODO :) */
-            xlseek(archive_handle->src_fd, -2, SEEK_CUR);
-        } else
-            bb_error_msg_and_die("no gzip"
-                USE_FEATURE_RPM_BZ2("/bzip")
-                " magic");
-    } else {
-        check_header_gzip_or_die(archive_handle->src_fd);
-#if !BB_MMU
-        /* NOMMU version of open_transformer execs an external unzipper that should
-         * have the file position at the start of the file */
-        xlseek(archive_handle->src_fd, 0, SEEK_SET);
-#endif
-    }
-
-    xchdir("/"); /* Install RPM's to root */
-    archive_handle->src_fd = open_transformer(archive_handle->src_fd, xformer, xformer_prog, xformer_prog, "-cf", "-", NULL);
-    archive_handle->offset = 0;
+    /*archive_handle->offset = 0; - init_handle() did it */
+
+    setup_unzip_on_fd(archive_handle->src_fd /*, fail_if_not_detected: 1*/);
     while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
         continue;
 }
 
-
 static rpm_index **rpm_gettags(int fd, int *num_tags)
 {
-    /* We should never need mode than 200, and realloc later */
-    rpm_index **tags = xzalloc(200 * sizeof(struct rpmtag *));
+    /* We should never need more than 200 (shrink via realloc later) */
+    rpm_index **tags = xzalloc(200 * sizeof(tags[0]));
     int pass, tagindex = 0;
 
@@ -256 +240 @@
     /* 1st pass is the signature headers, 2nd is the main stuff */
     for (pass = 0; pass < 2; pass++) {
-        struct {
-            char magic[3]; /* 3 byte magic: 0x8e 0xad 0xe8 */
-            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) */
-        } header;
+        struct rpm_header header;
         rpm_index *tmpindex;
         int storepos;
 
         xread(fd, &header, sizeof(header));
-        if (strncmp((char *) &header.magic, RPM_HEADER_MAGIC, 3) != 0)
-            return NULL; /* Invalid magic */
-        if (header.version != 1)
-            return NULL; /* This program only supports v1 headers */
+        if (header.magic_and_ver != htonl(RPM_HEADER_MAGICnVER))
+            return NULL; /* Invalid magic, or not version 1 */
         header.size = ntohl(header.size);
         header.entries = ntohl(header.entries);
-        storepos = xlseek(fd,0,SEEK_CUR) + header.entries * 16;
+        storepos = xlseek(fd, 0, SEEK_CUR) + header.entries * 16;
 
         while (header.entries--) {
-            tmpindex = tags[tagindex++] = xmalloc(sizeof(rpm_index));
-            xread(fd, tmpindex, sizeof(rpm_index));
+            tmpindex = tags[tagindex++] = xmalloc(sizeof(*tmpindex));
+            xread(fd, tmpindex, sizeof(*tmpindex));
             tmpindex->tag = ntohl(tmpindex->tag);
             tmpindex->type = ntohl(tmpindex->type);
             tmpindex->count = ntohl(tmpindex->count);
             tmpindex->offset = storepos + ntohl(tmpindex->offset);
-            if (pass==0)
+            if (pass == 0)
                 tmpindex->tag -= 743;
         }
-        xlseek(fd, header.size, SEEK_CUR); /* Seek past store */
+        storepos = xlseek(fd, header.size, SEEK_CUR); /* Seek past store */
         /* Skip padding to 8 byte boundary after reading signature headers */
-        if (pass==0)
-            xlseek(fd, (8 - (xlseek(fd,0,SEEK_CUR) % 8)) % 8, SEEK_CUR);
-    }
-    tags = xrealloc(tags, tagindex * sizeof(struct rpmtag *)); /* realloc tags to save space */
+        if (pass == 0)
+            xlseek(fd, (-storepos) & 0x7, SEEK_CUR);
+    }
+    /* realloc tags to save space */
+    tags = xrealloc(tags, tagindex * sizeof(tags[0]));
     *num_tags = tagindex;
-    return tags; /* All done, leave the file at the start of the gzipped cpio archive */
+    /* All done, leave the file at the start of the gzipped cpio archive */
+    return tags;
 }
 
@@ -317 +295 @@
     if (!found || itemindex >= found[0]->count)
         return NULL;
-    if (found[0]->type == RPM_STRING_TYPE || found[0]->type == RPM_I18NSTRING_TYPE || found[0]->type == RPM_STRING_ARRAY_TYPE) {
+    if (found[0]->type == RPM_STRING_TYPE
+     || found[0]->type == RPM_I18NSTRING_TYPE
+     || found[0]->type == RPM_STRING_ARRAY_TYPE
+    ) {
         int n;
-        char *tmpstr = (char *) (map + found[0]->offset);
-        for (n=0; n < itemindex; n++)
+        char *tmpstr = (char *) map + found[0]->offset;
+        for (n = 0; n < itemindex; n++)
             tmpstr = tmpstr + strlen(tmpstr) + 1;
         return tmpstr;
@@ -338 +319 @@
         return -1;
 
-    tmpint = (int *) (map + found[0]->offset);
+    tmpint = (int *) ((char *) map + found[0]->offset);
 
     if (found[0]->type == RPM_INT32_TYPE) {
@@ -381 +362 @@
 static void fileaction_setowngrp(char *filename, int fileref)
 {
-    int uid, gid;
-    uid = xuname2uid(rpm_getstr(TAG_FILEUSERNAME, fileref));
-    gid = xgroup2gid(rpm_getstr(TAG_FILEGROUPNAME, fileref));
+    /* real rpm warns: "user foo does not exist - using <you>" */
+    struct passwd *pw = getpwnam(rpm_getstr(TAG_FILEUSERNAME, fileref));
+    int uid = pw ? pw->pw_uid : getuid(); /* or euid? */
+    struct group *gr = getgrnam(rpm_getstr(TAG_FILEGROUPNAME, fileref));
+    int gid = gr ? gr->gr_gid : getgid();
     chown(filename, uid, gid);
 }