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

fail if sources are not regular files 

CVS patchset: 2118
CVS date: 1998/05/18 15:16:16
This commit is contained in:
marc 1998-05-18 15:16:16 +00:00
parent b460ebd46b
commit c1b802dfda
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
2.5 -> 2.5.1:
- fail if sources are not regular files
2.4.109 -> 2.5:
- fixed return code bug in build code
- do macro expansion before %if processing

45
build/parseSpec.c
View File

@ -2,6 +2,7 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <sys/stat.h>
#include "header.h"
#include "rpmlib.h"
@ -11,6 +12,7 @@
#include "read.h"
#include "misc.h"
static int checkSources(Spec spec);
static void setStandardMacros(Spec spec, char *arch, char *os);
int parseSpec(Spec *specp, char *specFile, char *buildRoot,
@ -158,9 +160,52 @@ int parseSpec(Spec *specp, char *specFile, char *buildRoot,
closeSpec(spec);
*specp = spec;
if (checkSources(spec)) {
freeSpec(spec);
return 1;
}
return 0;
}
static int checkSources(Spec spec)
{
struct Source *p;
Package pkg;
char buf[BUFSIZ];
struct stat sb;
int res = 0;
p = spec->sources;
while (p) {
sprintf(buf, "%s/%s", rpmGetVar(RPMVAR_SOURCEDIR), p->source);
lstat(buf, &sb);
if (! S_ISREG(sb.st_mode)) {
rpmError(RPMERR_BADSPEC, "Source file not regular: %s", buf);
res = 1;
}
p = p->next;
}
pkg = spec->packages;
while (pkg) {
p = pkg->icon;
while (p) {
sprintf(buf, "%s/%s", rpmGetVar(RPMVAR_SOURCEDIR), p->source);
lstat(buf, &sb);
if (! S_ISREG(sb.st_mode)) {
rpmError(RPMERR_BADSPEC, "Source file not regular: %s", buf);
res = 1;
}
p = p->next;
}
pkg = pkg->next;
}
return res;
}
static void setStandardMacros(Spec spec, char *arch, char *os)
{
char buf[BUFSIZ];