Revert "pkg: use absolute filenames for packages"
This reverts commit 46430ceb56
.
The problem this was suppoed to fix was fixed by letting apk_db_open()
return with same working dir.
cute-signatures
parent
02073e84d6
commit
600f9e7e03
|
@ -13,7 +13,6 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <limits.h>
|
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -326,16 +325,12 @@ struct apk_package *apk_pkg_read(struct apk_database *db, const char *file)
|
||||||
{
|
{
|
||||||
struct read_info_ctx ctx;
|
struct read_info_ctx ctx;
|
||||||
struct apk_bstream *bs;
|
struct apk_bstream *bs;
|
||||||
char realfile[PATH_MAX];
|
|
||||||
|
|
||||||
if (realpath(file, realfile) < 0)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
ctx.pkg = apk_pkg_new();
|
ctx.pkg = apk_pkg_new();
|
||||||
if (ctx.pkg == NULL)
|
if (ctx.pkg == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
bs = apk_bstream_from_file(realfile);
|
bs = apk_bstream_from_file(file);
|
||||||
if (bs == NULL)
|
if (bs == NULL)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
@ -360,7 +355,7 @@ struct apk_package *apk_pkg_read(struct apk_database *db, const char *file)
|
||||||
};
|
};
|
||||||
apk_deps_add(&ctx.pkg->depends, &dep);
|
apk_deps_add(&ctx.pkg->depends, &dep);
|
||||||
}
|
}
|
||||||
ctx.pkg->filename = strdup(realfile);
|
ctx.pkg->filename = strdup(file);
|
||||||
|
|
||||||
return ctx.pkg;
|
return ctx.pkg;
|
||||||
err:
|
err:
|
||||||
|
|
Loading…
Reference in New Issue