emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_unpack_binary_pkg: handle EPERM more efficiently.

Browse Source
This commit is contained in:
Juan RP 2011-12-24 12:07:30 +01:00
parent 9d767f19cb
commit 39d064aff8
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/package_unpack.c
View File

@ -31,6 +31,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h>
#include "xbps_api_impl.h" #include "xbps_api_impl.h"
@ -88,23 +89,44 @@ extract_metafile(struct archive *ar,
int flags) int flags)
{ {
const char *version; const char *version;
char *buf, *pkgname; char *buf, *dirc, *dname, *pkgname;
int rv; int rv;
pkgname = xbps_pkg_name(pkgver); pkgname = xbps_pkg_name(pkgver);
if (pkgname == NULL) if (pkgname == NULL)
return ENOMEM; return ENOMEM;
version = xbps_pkg_version(pkgver); version = xbps_pkg_version(pkgver);
if (version == NULL) {
free(pkgname);
return ENOMEM;
}
buf = xbps_xasprintf("%s/metadata/%s/%s", buf = xbps_xasprintf("%s/metadata/%s/%s",
XBPS_META_PATH, pkgname, file); XBPS_META_PATH, pkgname, file);
if (buf == NULL) { if (buf == NULL) {
free(pkgname); free(pkgname);
return ENOMEM; return ENOMEM;
} }
archive_entry_set_pathname(entry, buf); archive_entry_set_pathname(entry, buf);
dirc = strdup(buf);
if (dirc == NULL) {
free(buf);
free(pkgname);
return ENOMEM;
}
free(buf); free(buf);
dname = dirname(dirc);
if (access(dname, X_OK) == -1) {
if (xbps_mkpath(dname, 0755) == -1) {
xbps_set_cb_state(XBPS_STATE_UNPACK_FAIL,
errno, pkgname, version,
"%s: [unpack] failed to create metadir `%s': %s",
pkgver, dname, strerror(errno));
free(dirc);
free(pkgname);
return errno;
}
}
if (exec) if (exec)
archive_entry_set_perm(entry, 0750); archive_entry_set_perm(entry, 0750);
@ -132,7 +154,10 @@ remove_metafile(const char *file, const char *pkgver)
if (pkgname == NULL) if (pkgname == NULL)
return ENOMEM; return ENOMEM;
version = xbps_pkg_version(pkgver); version = xbps_pkg_version(pkgver);
if (version == NULL) {
free(pkgname);
return ENOMEM;
}
buf = xbps_xasprintf("%s/metadata/%s/%s", buf = xbps_xasprintf("%s/metadata/%s/%s",
XBPS_META_PATH, pkgname, file); XBPS_META_PATH, pkgname, file);
if (buf == NULL) { if (buf == NULL) {
@ -261,14 +286,14 @@ unpack_archive(prop_dictionary_t pkg_repod, struct archive *ar)
} }
rv = extract_metafile(ar, entry, "INSTALL", rv = extract_metafile(ar, entry, "INSTALL",
pkgver, true, flags); pkgver, true, flags);
if (rv != 0) { if (rv != 0)
free(buf);
goto out; goto out;
}
rv = xbps_file_exec(buf, "pre", rv = xbps_file_exec(buf, "pre",
pkgname, version, update ? "yes" : "no", pkgname, version, update ? "yes" : "no",
xhp->conffile, NULL); xhp->conffile, NULL);
free(buf); free(buf);
buf = NULL;
if (rv != 0) { if (rv != 0) {
xbps_set_cb_state(XBPS_STATE_UNPACK_FAIL, xbps_set_cb_state(XBPS_STATE_UNPACK_FAIL,
rv, pkgname, version, rv, pkgname, version,
@ -423,6 +448,7 @@ unpack_archive(prop_dictionary_t pkg_repod, struct archive *ar)
} }
(void)rename(entry_pname, buf); (void)rename(entry_pname, buf);
free(buf); free(buf);
buf = NULL;
xbps_set_cb_state(XBPS_STATE_CONFIG_FILE, 0, xbps_set_cb_state(XBPS_STATE_CONFIG_FILE, 0,
pkgname, version, pkgname, version,
"Renamed old configuration file " "Renamed old configuration file "
@ -615,7 +641,7 @@ xbps_unpack_binary_pkg(prop_dictionary_t pkg_repod)
if (rv != 0) { if (rv != 0) {
xbps_set_cb_state(XBPS_STATE_UNPACK_FAIL, xbps_set_cb_state(XBPS_STATE_UNPACK_FAIL,
rv, pkgname, version, rv, pkgname, version,
"%s: [unpack] failed to unpack files on archive: %s", "%s: [unpack] failed to unpack files from archive: %s",
pkgver, strerror(rv)); pkgver, strerror(rv));
goto out; goto out;
} }