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

Since we really want a FILE* then get one in the first place 

- this is visible in the librpmbuild exported goo, rename the member
  to force build-breakage on the poor souls trying to use librpmbuild API
This commit is contained in:
Panu Matilainen 2009-10-16 13:36:39 +03:00
parent b0d1038190
commit f677a821ad
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/parseSpec.c
View File

@ -210,12 +210,12 @@ static int readLineFromOFI(rpmSpec spec, OFI_t *ofi)
{
retry:
/* Make sure the current file is open */
if (ofi->fd == NULL) {
ofi->fd = Fopen(ofi->fileName, "r.fpio");
if (ofi->fd == NULL || Ferror(ofi->fd)) {
if (ofi->fp == NULL) {
ofi->fp = fopen(ofi->fileName, "r");
if (ofi->fp == NULL || ferror(ofi->fp)) {
/* XXX Fstrerror */
rpmlog(RPMLOG_ERR, _("Unable to open %s: %s\n"),
ofi->fileName, Fstrerror(ofi->fd));
ofi->fileName, strerror(errno));
return PART_ERROR;
}
spec->lineNum = ofi->lineNum = 0;
@ -223,8 +223,7 @@ retry:
/* Make sure we have something in the read buffer */
if (!(ofi->readPtr && *(ofi->readPtr))) {
FILE * f = fdGetFILE(ofi->fd);
if (f == NULL || !fgets(ofi->readBuf, BUFSIZ, f)) {
if (!fgets(ofi->readBuf, BUFSIZ, ofi->fp)) {
/* EOF */
if (spec->readStack->next) {
rpmlog(RPMLOG_ERR, _("Unclosed %%if\n"));
@ -233,7 +232,7 @@ retry:
/* remove this file from the stack */
spec->fileStack = ofi->next;
(void) Fclose(ofi->fd);
fclose(ofi->fp);
ofi->fileName = _free(ofi->fileName);
ofi = _free(ofi);
@ -394,7 +393,7 @@ void closeSpec(rpmSpec spec)
while (spec->fileStack) {
ofi = spec->fileStack;
spec->fileStack = spec->fileStack->next;
if (ofi->fd) (void) Fclose(ofi->fd);
if (ofi->fp) (void) fclose(ofi->fp);
ofi->fileName = _free(ofi->fileName);
ofi = _free(ofi);
}

2
build/rpmspec.h
View File

@ -55,7 +55,7 @@ typedef struct ReadLevelEntry {
*/
typedef struct OpenFileInfo {
char * fileName;
FD_t fd;
FILE *fp;
int lineNum;
char readBuf[BUFSIZ];
char * readPtr;

2
build/spec.c
View File

@ -530,7 +530,7 @@ struct OpenFileInfo * newOpenFileInfo(void)
struct OpenFileInfo *ofi;
ofi = xmalloc(sizeof(*ofi));
ofi->fd = NULL;
ofi->fp = NULL;
ofi->fileName = NULL;
ofi->lineNum = 0;
ofi->readBuf[0] = '\0';