Notes on portability, and on when #include <linux/blah> is appropriate.

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

diff --git a/archival/rpm.c b/archival/rpm.c
index 41c6129adb2e65a70d39f50e264350a6e5829db3..7f69f0510412ad061bcdfaa842412b76aa631a19 100644 (file)
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 2001,2002 by Laurence Anderson
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdio.h>
@@ -43,7 +31,7 @@
 #define RPM_STRING_ARRAY_TYPE  8
 #define RPM_I18NSTRING_TYPE    9
 
-#define        RPMTAG_NAME                     1000
+#define        RPMTAG_NAME                             1000
 #define        RPMTAG_VERSION                  1001
 #define        RPMTAG_RELEASE                  1002
 #define        RPMTAG_SUMMARY                  1004
@@ -143,7 +131,7 @@ int rpm_main(int argc, char **argv)
                mytags = rpm_gettags(rpm_fd, (int *) &tagcount);
                offset = lseek(rpm_fd, 0, SEEK_CUR);
                if (!mytags) { printf("Error reading rpm header\n"); exit(-1); }
-               map = mmap(0, offset > getpagesize() ? (offset + offset % getpagesize()) : getpagesize(), PROT_READ, MAP_SHARED, rpm_fd, 0); // Mimimum is one page
+               map = mmap(0, offset > getpagesize() ? (offset + offset % getpagesize()) : getpagesize(), PROT_READ, MAP_PRIVATE, rpm_fd, 0); // Mimimum is one page
                if (func & rpm_install) {
                        loop_through_files(RPMTAG_BASENAMES, fileaction_dobackup); /* Backup any config files */
                        extract_cpio_gz(rpm_fd); // Extact the archive
@@ -243,7 +231,7 @@ rpm_index **rpm_gettags(int fd, int *num_tags)
                storepos = lseek(fd,0,SEEK_CUR) + header.entries * 16;
 
                while (header.entries--) {
-                       tmpindex = tags[tagindex++] = malloc(sizeof(rpm_index));
+                       tmpindex = tags[tagindex++] = xmalloc(sizeof(rpm_index));
                        read(fd, tmpindex, sizeof(rpm_index));
                        tmpindex->tag = ntohl(tmpindex->tag); tmpindex->type = ntohl(tmpindex->type); tmpindex->count = ntohl(tmpindex->count);
                        tmpindex->offset = storepos + ntohl(tmpindex->offset);
@@ -259,18 +247,15 @@ rpm_index **rpm_gettags(int fd, int *num_tags)
 
 int bsearch_rpmtag(const void *key, const void *item)
 {
+       int *tag = (int *)key;
        rpm_index **tmp = (rpm_index **) item;
-       /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
-        * it's ok to ignore it because this isn't a 'real' pointer */
-       return ((int) key - tmp[0]->tag);
+       return (*tag - tmp[0]->tag);
 }
 
 int rpm_getcount(int tag)
 {
        rpm_index **found;
-       /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
-        * it's ok to ignore it because tag won't be used as a pointer */
-       found = bsearch((void *) tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+       found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
        if (!found) return 0;
        else return found[0]->count;
 }
@@ -278,9 +263,7 @@ int rpm_getcount(int tag)
 char *rpm_getstring(int tag, int itemindex)
 {
        rpm_index **found;
-       /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
-        * it's ok to ignore it because tag won't be used as a pointer */
-       found = bsearch((void *) tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+       found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
        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) {
                int n;
@@ -296,7 +279,7 @@ int rpm_getint(int tag, int itemindex)
        int n, *tmpint;
        /* gcc throws warnings here when sizeof(void*)!=sizeof(int) ...
         * it's ok to ignore it because tag won't be used as a pointer */
-       found = bsearch((void *) tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
+       found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag);
        if (!found || itemindex >= found[0]->count) return -1;
        tmpint = (int *) (map + found[0]->offset);
        if (found[0]->type == RPM_INT32_TYPE) {
@@ -331,12 +314,12 @@ void fileaction_dobackup(char *filename, int fileref)
 void fileaction_setowngrp(char *filename, int fileref)
 {
        int uid, gid;
-       uid = my_getpwnam(rpm_getstring(RPMTAG_FILEUSERNAME, fileref));
-       gid = my_getgrnam(rpm_getstring(RPMTAG_FILEGROUPNAME, fileref));
+       uid = bb_xgetpwnam(rpm_getstring(RPMTAG_FILEUSERNAME, fileref));
+       gid = bb_xgetgrnam(rpm_getstring(RPMTAG_FILEGROUPNAME, fileref));
        chown (filename, uid, gid);
 }
 
-void fileaction_list(char *filename, int fileref)
+void fileaction_list(char *filename, int ATTRIBUTE_UNUSED fileref)
 {
        printf("%s\n", filename);
 }