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

xbps_file_hash_check_dictionary: fixed for rootdir != /.

Browse Source
This commit is contained in:
Juan RP 2012-06-05 20:51:00 +02:00
parent a00a450fe0
commit a0f91f3342
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/util_hash.c
View File

@ -143,7 +143,7 @@ xbps_file_hash_dictionary(prop_dictionary_t d,
{ {
prop_object_t obj; prop_object_t obj;
prop_object_iterator_t iter; prop_object_iterator_t iter;
const char *curfile, *sha256; const char *curfile = NULL, *sha256 = NULL;
assert(prop_object_type(d) == PROP_TYPE_DICTIONARY); assert(prop_object_type(d) == PROP_TYPE_DICTIONARY);
assert(key != NULL); assert(key != NULL);
@ -178,22 +178,31 @@ xbps_file_hash_check_dictionary(prop_dictionary_t d,
const char *key, const char *key,
const char *file) const char *file)
{ {
const char *sha256d; struct xbps_handle *xhp = xbps_handle_get();
const char *sha256d = NULL;
char *buf;
int rv; int rv;
assert(prop_object_type(d) == PROP_TYPE_DICTIONARY); assert(prop_object_type(d) == PROP_TYPE_DICTIONARY);
assert(key != NULL); assert(key != NULL);
assert(file != NULL); assert(file != NULL);
sha256d = xbps_file_hash_dictionary(d, key, file); if ((sha256d = xbps_file_hash_dictionary(d, key, file)) == NULL) {
if (sha256d == NULL) {
if (errno == ENOENT) if (errno == ENOENT)
return 1; /* no match, file not found */ return 1; /* no match, file not found */
return -1; /* error */ return -1; /* error */
} }
if ((rv = xbps_file_hash_check(file, sha256d)) == 0) if (strcmp(xhp->rootdir, "/") == 0) {
rv = xbps_file_hash_check(file, sha256d);
} else {
buf = xbps_xasprintf("%s/%s", xhp->rootdir, file);
assert(buf != NULL);
rv = xbps_file_hash_check(buf, sha256d);
free(buf);
}
if (rv == 0)
return 0; /* matched */ return 0; /* matched */
else if (rv == ERANGE || rv == ENOENT) else if (rv == ERANGE || rv == ENOENT)
return 1; /* no match */ return 1; /* no match */