Kill off per-file cpio map flags

- nothing uses/needs them, one less murky fi->foo allocation less
- apparently a leftover from initial multilib attempts long long ago

diff --git a/build/files.c b/build/files.c
index 7fb7e04..5d58564 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -1270,7 +1270,6 @@ static void genCpioListAndHeader(FileList fl,
     a = (char *)(fi->apath + fi->fc);
     *a = '\0';
 
-    fi->fmapflags = xcalloc(sizeof(*fi->fmapflags), fi->fc);
     fi->astriplen = 0;
     if (fl->buildRoot)
        fi->astriplen = strlen(fl->buildRoot);
@@ -1280,6 +1279,11 @@ static void genCpioListAndHeader(FileList fl,
     fi->fuser = _free(fi->fuser);
     fi->fgroup = _free(fi->fgroup);
 
+    fi->mapflags = CPIO_MAP_PATH |
+           CPIO_MAP_TYPE | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
+    if (isSrc)
+       fi->mapflags |= CPIO_FOLLOW_SYMLINKS;
+
     /* Make the cpio list */
     for (i = 0, flp = fl->fileList; i < fi->fc; i++, flp++) {
        char * b;
@@ -1323,11 +1327,6 @@ static void genCpioListAndHeader(FileList fl,
            continue;
        }
        fi->actions[i] = FA_COPYOUT;
-       fi->fmapflags[i] = CPIO_MAP_PATH |
-               CPIO_MAP_TYPE | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
-       if (isSrc)
-           fi->fmapflags[i] |= CPIO_FOLLOW_SYMLINKS;
-
     }
     if (fip)
        *fip = fi;

diff --git a/lib/fsm.c b/lib/fsm.c
index 835061f..fb2b5df 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -627,7 +627,7 @@ static int fsmMapPath(FSM_t fsm)
        fsm->astriplen = fi->astriplen;
        fsm->action = (fi->actions ? fi->actions[i] : fi->action);
        fsm->fflags = (fi->fflags ? fi->fflags[i] : fi->flags);
-       fsm->mapFlags = (fi->fmapflags ? fi->fmapflags[i] : fi->mapflags);
+       fsm->mapFlags = fi->mapflags;
 
        /* src rpms have simple base name in payload. */
        fsm->dirName = fi->dnl[fi->dil[i]];

diff --git a/lib/psm.c b/lib/psm.c
index 285eb88..abf3b5d 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -300,8 +300,6 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd,
        }
     }
 
-    /* XXX FIXME: don't do per-file mapping, force global flags. */
-    fi->fmapflags = _free(fi->fmapflags);
     fi->mapflags = CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
 
     fi->astriplen = 0;

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index d888017..a2803b5 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -1161,7 +1161,6 @@ fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc);
 
     fi->fn = _free(fi->fn);
     fi->apath = _free(fi->apath);
-    fi->fmapflags = _free(fi->fmapflags);
 
     fi->obnl = _free(fi->obnl);
     fi->odnl = _free(fi->odnl);

diff --git a/lib/rpmfi_internal.h b/lib/rpmfi_internal.h
index e772ab6..46f87b3 100644 (file)
--- a/lib/rpmfi_internal.h
+++ b/lib/rpmfi_internal.h
@@ -109,7 +109,6 @@ struct rpmfi_s {
     mode_t fperms;             /*!< File perms (0644) if not mapped. */
     const char ** apath;
     int mapflags;
-    int * fmapflags;
     FSM_t fsm;                 /*!< File state machine data. */
     int keep_header;           /*!< Keep header? */
     sharedFileInfo replaced;   /*!< (TR_ADDED) */