From dfc8d4ce4c6e8fdc30491d52e2014bd33d961dee Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 21 Jan 2009 09:59:12 +0000 Subject: Revert "Revert "pkg: use absolute filenames for packages"" This reverts commit 600f9e7e031c9e7244e078f35ec6c8dce1011149. My bad. This was correct. --- src/package.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/package.c b/src/package.c index d4147ff..25f09d6 100644 --- a/src/package.c +++ b/src/package.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -325,12 +326,16 @@ struct apk_package *apk_pkg_read(struct apk_database *db, const char *file) { struct read_info_ctx ctx; struct apk_bstream *bs; + char realfile[PATH_MAX]; + + if (realpath(file, realfile) < 0) + return NULL; ctx.pkg = apk_pkg_new(); if (ctx.pkg == NULL) return NULL; - bs = apk_bstream_from_file(file); + bs = apk_bstream_from_file(realfile); if (bs == NULL) goto err; @@ -355,7 +360,7 @@ struct apk_package *apk_pkg_read(struct apk_database *db, const char *file) }; apk_deps_add(&ctx.pkg->depends, &dep); } - ctx.pkg->filename = strdup(file); + ctx.pkg->filename = strdup(realfile); return ctx.pkg; err: -- cgit v1.2.3-70-g09d2