sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed RPMTAG_SIZE calculation

Browse Source
This commit is contained in:
Дмитрий Левин 2003-09-27 15:26:14 +00:00
parent bdd0317870
commit 62c081a169
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/files.c
View File

@ -1329,8 +1329,6 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
&(flp->flags), 1);
}
(void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE,
&(fl->totalFileSize), 1);
/* XXX This should be added always so that packages look alike.
* XXX However, there is logic in files.c/depends.c that checks for
@ -1442,6 +1440,10 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
fi->actions[i] = FA_SKIP;
continue;
}
if (S_ISREG(flp->fl_mode))
fl->totalFileSize += flp->fl_size;
fi->actions[i] = FA_COPYOUT;
fi->fuids[i] = getUidS(flp->uname);
fi->fgids[i] = getGidS(flp->gname);
@ -1462,6 +1464,8 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
fi = _free(fi);
/*@=branchstate@*/
}
(void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE,
&(fl->totalFileSize), 1);
}
/**
@ -1690,9 +1694,6 @@ static int addFile(FileList fl, const char * diskURL,
}
} else
i = fl->fileListRecsUsed;
if (S_ISREG(flp->fl_mode) && i >= fl->fileListRecsUsed)
fl->totalFileSize += flp->fl_size;
}
fl->fileListRecsUsed++;