folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make reading the cpio header a function

This commit is contained in:
Florian Festi 2013-04-18 14:58:17 +09:00
parent 000dc5f499
commit 8ef918fab8
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/fsm.c
View File

@ -1625,6 +1625,30 @@ static void setFileState(rpmfs fs, int i, rpmFileAction action)
}
}
static int readCpioHeader(FSM_t fsm, rpmcpio_t archive)
{
int rc;
/* Read next payload header. */
rc = rpmcpioHeaderRead(archive, &(fsm->path), &(fsm->sb));
if (rc == CPIOERR_HDR_TRAILER) {
return rc;
}
/* Identify mapping index. */
fsm->ix = mapFind(fsm->iter, fsm->path);
/* Mapping error */
if (fsm->ix < 0) {
if (fsm->failedFile && *fsm->failedFile == NULL)
*fsm->failedFile = xstrdup(fsm->path);
rc = CPIOERR_UNMAPPED_FILE;
}
return rc;
}
int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
rpmpsm psm, char ** failedFile)
{
@ -1658,7 +1682,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
fsmReset(fsm);
/* Read next payload header. */
rc = rpmcpioHeaderRead(archive, &(fsm->path), &(fsm->sb));
rc = readCpioHeader(fsm, archive);
/* Detect and exit on end-of-payload. */
if (rc == CPIOERR_HDR_TRAILER) {
@ -1668,17 +1692,6 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
if (rc) break;
/* Identify mapping index. */
fsm->ix = mapFind(fsm->iter, fsm->path);
/* Mapping error */
if (fsm->ix < 0) {
if (fsm->failedFile && *fsm->failedFile == NULL)
*fsm->failedFile = xstrdup(fsm->path);
rc = CPIOERR_UNMAPPED_FILE;
break;
}
rc = fsmInit(fsm);
/* Exit on error. */