From dd46457ab5bedcaad7f83782dc6057d97372ec50 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 10 Jun 2008 14:31:43 +0300 Subject: [PATCH] Eliminate rpmfiBuildFNames() use in psm --- lib/psm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/psm.c b/lib/psm.c index 682e16f..10309b4 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -320,7 +320,9 @@ rpmRC rpmInstallSourcePackage(rpmts ts, FD_t fd, i = fi->fc; if (fi->h != NULL) { /* XXX can't happen */ - rpmfiBuildFNames(fi->h, RPMTAG_BASENAMES, &fi->apath, NULL); + struct rpmtd_s bnames; + headerGet(fi->h, RPMTAG_FILENAMES, &bnames, HEADERGET_EXT); + fi->apath = bnames.data; /* XXX Ick */ if (headerIsEntry(fi->h, RPMTAG_COOKIE)) for (i = 0; i < fi->fc; i++) @@ -1305,10 +1307,14 @@ assert(psm->mi == NULL); fi->mapflags = CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID | (fi->mapflags & CPIO_SBIT_CHECK); - if (headerIsEntry(fi->h, RPMTAG_ORIGBASENAMES)) - rpmfiBuildFNames(fi->h, RPMTAG_ORIGBASENAMES, &fi->apath, NULL); - else - rpmfiBuildFNames(fi->h, RPMTAG_BASENAMES, &fi->apath, NULL); + { struct rpmtd_s filenames; + rpmTag ftag = RPMTAG_FILENAMES; + if (headerIsEntry(fi->h, RPMTAG_ORIGBASENAMES)) { + ftag = RPMTAG_ORIGFILENAMES; + } + headerGet(fi->h, ftag, &filenames, HEADERGET_EXT); + fi->apath = filenames.data; /* Ick.. */ + } if (fi->fuser == NULL) xx = hge(fi->h, RPMTAG_FILEUSERNAME, NULL, -- 2.7.4