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

Explicitly set errno to ENOENT when a pkg hasn't been found in array/dictionaries.

Browse Source
This commit is contained in:
Juan RP
2014-05-17 12:36:02 +02:00
parent db0b69b397
commit a3f2898ea6
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/plist_find.c
View File

@ -90,7 +90,11 @@ get_pkg_in_array(xbps_array_t array, const char *str, bool virtual)
} }
xbps_object_iterator_release(iter); xbps_object_iterator_release(iter);
return found ? obj : NULL; if (!found) {
errno = ENOENT;
return NULL;
}
return obj;
} }
xbps_dictionary_t HIDDEN xbps_dictionary_t HIDDEN
@ -140,8 +144,10 @@ match_pkg_by_pkgver(xbps_dictionary_t repod, const char *p)
d = xbps_dictionary_get(repod, pkgname); d = xbps_dictionary_get(repod, pkgname);
if (d) { if (d) {
xbps_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver); xbps_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver);
if (strcmp(pkgver, p)) if (strcmp(pkgver, p)) {
d = NULL; d = NULL;
errno = ENOENT;
}
} }
free(pkgname); free(pkgname);
@ -168,8 +174,10 @@ match_pkg_by_pattern(xbps_dictionary_t repod, const char *p)
if (d) { if (d) {
xbps_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver); xbps_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver);
assert(pkgver); assert(pkgver);
if (!xbps_pkgpattern_match(pkgver, p)) if (!xbps_pkgpattern_match(pkgver, p)) {
d = NULL; d = NULL;
errno = ENOENT;
}
} }
free(pkgname); free(pkgname);

2
lib/repo_pkgdeps.c
View File

@ -224,7 +224,7 @@ find_repo_deps(struct xbps_handle *xhp,
if (errno && errno != ENOENT) { if (errno && errno != ENOENT) {
/* error */ /* error */
rv = errno; rv = errno;
xbps_dbg_printf(xhp, "failed to find installed pkg for `%s': %s\n", reqpkg, strerror(errno)); xbps_dbg_printf(xhp, "failed to find installed pkg for `%s': %s\n", reqpkg, strerror(rv));
free(pkgname); free(pkgname);
break; break;
} }