pygos/pkg-utils
1
0
Fork 0
mirror of https://github.com/pygos/pkg-utils.git synced 2024-11-22 12:59:46 +01:00
Code Issues Releases Wiki Activity

pack: If source path is omitted, interpret as relative path

Browse source 
If no source file path is given for the file statement in a package source
listing, take the actual file name and interpret it as relative to the
source listing file.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-01-31 23:23:05 +01:00
parent a32a4cb149
commit effe7bf69a
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main/cmd/pack/filelist.c
View file

@ -160,12 +160,26 @@ int filelist_mkfile(input_file_t *f, void *obj)
{ {
image_entry_t *ent = filelist_mkentry(f, S_IFREG); image_entry_t *ent = filelist_mkentry(f, S_IFREG);
image_entry_t **listptr = obj; image_entry_t **listptr = obj;
const char *ptr;
struct stat sb; struct stat sb;
if (ent == NULL) if (ent == NULL)
return -1; return -1;
if (f->line[0] == '\0') {
ptr = strrchr(f->filename, '/');
if (ptr == NULL) {
ent->data.file.location = strdup(ent->name);
} else {
asprintf(&ent->data.file.location, "%.*s/%s",
(int)(ptr - f->filename), f->filename,
ent->name);
}
} else {
ent->data.file.location = strdup(f->line); ent->data.file.location = strdup(f->line);
}
if (ent->data.file.location == NULL) { if (ent->data.file.location == NULL) {
oom(f); oom(f);
goto fail; goto fail;