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

Merge pull request #117 from Duncaen/xbps_binpkg_exists

Browse Source 
xbps_binpkg_exists: fix access() on remote packages and avoid malloc
This commit is contained in:
Juan RP 2019-06-15 13:07:58 +02:00 committed by GitHub
commit 656a9145a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/util.c
View File

@ -328,17 +328,27 @@ xbps_repository_pkg_path(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod)
bool
xbps_binpkg_exists(struct xbps_handle *xhp, xbps_dictionary_t pkgd)
{
char *binpkg;
bool exists = true;
char path[PATH_MAX];
const char *pkgver, *arch, *repoloc;
if ((binpkg = xbps_repository_pkg_path(xhp, pkgd)) == NULL)
return false;
assert(xhp);
assert(xbps_object_type(pkgd) == XBPS_TYPE_DICTIONARY);
if (access(binpkg, R_OK) == -1)
exists = false;
if (!xbps_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver))
return NULL;
if (!xbps_dictionary_get_cstring_nocopy(pkgd,
"architecture", &arch))
return NULL;
if (!xbps_dictionary_get_cstring_nocopy(pkgd,
"repository", &repoloc))
return NULL;
free(binpkg);
return exists;
snprintf(path, sizeof(path), "%s/%s.%s.xbps",
xbps_repository_is_remote(repoloc) ? xhp->cachedir : repoloc,
pkgver, arch);
return access(path, R_OK) == 0;
}
bool