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

Merge branch 'altlinux-4.0'

Browse Source
This commit is contained in:
Alexey Tourbin 2008-06-22 16:20:33 +04:00
commit 9b88480ee9
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
build/files.c
View File

@ -1448,10 +1448,6 @@ 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);
@ -1464,7 +1460,41 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
if (flp->flags & RPMFILE_MULTILIB_MASK)
fi->fmapflags[i] |= CPIO_MULTILIB;
if (S_ISREG(flp->fl_mode) && flp->fl_nlink == 1)
fl->totalFileSize += flp->fl_size;
else if (S_ISREG(flp->fl_mode) && flp->fl_nlink > 1) {
/* Hard links need be counted only once. */
int j = i + 1;
FileListRec jlp = flp + 1;
int found = 0;
for (; j < fi->fc; j++, jlp++) {
while (((jlp - fl->fileList) < (fl->fileListRecsUsed - 1)) &&
!strcmp(jlp->fileURL, jlp[1].fileURL))
jlp++;
if (jlp->flags & RPMFILE_EXCLUDE) {
j--;
continue;
}
if (jlp->flags & RPMFILE_GHOST)
continue;
if (!S_ISREG(jlp->fl_mode))
continue;
if (flp->fl_nlink != jlp->fl_nlink)
continue;
if (flp->fl_ino != jlp->fl_ino)
continue;
if (flp->fl_dev != jlp->fl_dev)
continue;
found = 1;
break;
}
if (!found) /* last entry in hardlink set */
fl->totalFileSize += flp->fl_size;
}
}
(void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE,
&(fl->totalFileSize), 1);
/*@-branchstate@*/
if (cpioList)
*cpioList = fi;
@ -1472,8 +1502,6 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
fi = _free(fi);
/*@=branchstate@*/
}
(void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE,
&(fl->totalFileSize), 1);
}
/**
@ -1801,24 +1829,6 @@ static int addFile(FileList fl, const char * diskURL,
&& !parseForRegexMultiLib(fileURL))
flp->flags |= multiLib;
/* Hard links need be counted only once. */
if (S_ISREG(flp->fl_mode) && flp->fl_nlink > 1) {
FileListRec ilp;
for (i = 0; i < fl->fileListRecsUsed; i++) {
ilp = fl->fileList + i;
if (!S_ISREG(ilp->fl_mode))
continue;
if (flp->fl_nlink != ilp->fl_nlink)
continue;
if (flp->fl_ino != ilp->fl_ino)
continue;
if (flp->fl_dev != ilp->fl_dev)
continue;
break;
}
} else
i = fl->fileListRecsUsed;
}
fl->fileListRecsUsed++;
@ -2354,8 +2364,6 @@ int processSourceFiles(Spec spec)
flp->gname = getGname(flp->fl_gid);
flp->langs = xstrdup("");
fl.totalFileSize += flp->fl_size;
if (! (flp->uname && flp->gname)) {
rpmError(RPMERR_BADSPEC, _("Bad owner/group: %s\n"), diskURL);
fl.processingFailed = 1;

2
build/parseSpec.c
View File

@ -414,7 +414,7 @@ retry:
if (spec->preprocess_mode) {
size_t len = strlen(spec->line);
if (spec->line[len-1] == '\n')
if (len > 0 && spec->line[len-1] == '\n')
len--; /* chomp */
fprintf(tmpfp, "%.*s\n", (int)len, spec->line);
}