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

Sanity. 

CVS patchset: 2561
CVS date: 1998/11/25 19:52:12
This commit is contained in:
jbj 1998-11-25 19:52:12 +00:00
parent 469f309419
commit b4b8bc6a61
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build/files.c
View File

@ -954,14 +954,13 @@ static int addFile(struct FileList *fl, const char *name, struct stat *statp)
fileUid = statp->st_uid; fileUid = statp->st_uid;
fileGid = statp->st_gid; fileGid = statp->st_gid;
/* %attr ? */ if (S_ISDIR(fileMode)) {
if (S_ISDIR(fileMode) && fl->cur_ar.ar_dmodestr) { if (fl->cur_ar.ar_dmodestr != NULL) {
if (fl->cur_ar.ar_dmodestr[0] != '-') {
fileMode &= S_IFMT; fileMode &= S_IFMT;
fileMode |= fl->cur_ar.ar_dmode; fileMode |= fl->cur_ar.ar_dmode;
} }
} else { } else {
if (fl->cur_ar.ar_fmodestr) { if (fl->cur_ar.ar_fmodestr != NULL) {
fileMode &= S_IFMT; fileMode &= S_IFMT;
fileMode |= fl->cur_ar.ar_fmode; fileMode |= fl->cur_ar.ar_fmode;
} }
@ -1076,6 +1075,8 @@ static int processPackageFiles(Spec spec, Package pkg,
AttrRec specialDocAttrRec; AttrRec specialDocAttrRec;
char *specialDoc = NULL; char *specialDoc = NULL;
specialDocAttrRec = empty_ar;
pkg->cpioList = NULL; pkg->cpioList = NULL;
pkg->cpioCount = 0; pkg->cpioCount = 0;
@ -1178,22 +1179,9 @@ static int processPackageFiles(Spec spec, Package pkg,
if (fl.isSpecialDoc) { if (fl.isSpecialDoc) {
/* Save this stuff for last */ /* Save this stuff for last */
FREE(specialDoc);
specialDoc = strdup(fileName); specialDoc = strdup(fileName);
specialDocAttrRec = fl.cur_ar; dupAttrRec(&fl.cur_ar, &specialDocAttrRec);
if (specialDocAttrRec.ar_fmodestr) {
specialDocAttrRec.ar_fmodestr =
strdup(specialDocAttrRec.ar_fmodestr);
}
if (specialDocAttrRec.ar_dmodestr) {
specialDocAttrRec.ar_dmodestr =
strdup(specialDocAttrRec.ar_dmodestr);
}
if (specialDocAttrRec.ar_user) {
specialDocAttrRec.ar_user = strdup(specialDocAttrRec.ar_user);
}
if (specialDocAttrRec.ar_group) {
specialDocAttrRec.ar_group = strdup(specialDocAttrRec.ar_group);
}
} else { } else {
processBinaryFile(pkg, &fl, fileName); processBinaryFile(pkg, &fl, fileName);
} }
@ -1205,9 +1193,9 @@ static int processPackageFiles(Spec spec, Package pkg,
doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test); doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
} }
/* fl.cur_ar now takes on "ownership" of the specialDocAttrRec */ dupAttrRec(&specialDocAttrRec, &fl.cur_ar);
/* allocated string data. */ freeAttrRec(&specialDocAttrRec);
fl.cur_ar = specialDocAttrRec;
fl.isDir = 0; fl.isDir = 0;
fl.inFtw = 0; fl.inFtw = 0;
fl.currentFlags = 0; fl.currentFlags = 0;