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

xbps-bin(8): fix a couple issues in the 'check' target.

Browse Source
This commit is contained in:
Juan RP 2011-07-28 16:24:16 +02:00
parent 98a2508c2e
commit 6c0b24029b
1 changed files with 98 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
bin/xbps-bin/check.c
View File

@ -57,32 +57,28 @@ check_pkg_integrity_all(void)
prop_object_t obj; prop_object_t obj;
prop_object_iterator_t iter = NULL; prop_object_iterator_t iter = NULL;
const char *pkgname, *version; const char *pkgname, *version;
int rv = 0;
size_t npkgs = 0, nbrokenpkgs = 0; size_t npkgs = 0, nbrokenpkgs = 0;
xhp = xbps_handle_get(); xhp = xbps_handle_get();
iter = xbps_array_iter_from_dict(xhp->regpkgdb_dictionary, "packages"); iter = xbps_array_iter_from_dict(xhp->regpkgdb_dictionary, "packages");
if (iter == NULL) { if (iter == NULL)
rv = ENOENT; return -1;
goto out;
}
while ((obj = prop_object_iterator_next(iter)) != NULL) { while ((obj = prop_object_iterator_next(iter)) != NULL) {
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname); prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version); prop_dictionary_get_cstring_nocopy(obj, "version", &version);
printf("Checking %s-%s ...\n", pkgname, version); printf("Checking %s-%s ...\n", pkgname, version);
if ((rv = check_pkg_integrity(pkgname)) != 0) if (check_pkg_integrity(pkgname) != 0)
nbrokenpkgs++; nbrokenpkgs++;
npkgs++; npkgs++;
} }
prop_object_iterator_release(iter);
printf("%zu package%s processed: %zu broken.\n", npkgs, printf("%zu package%s processed: %zu broken.\n", npkgs,
npkgs == 1 ? "" : "s", nbrokenpkgs); npkgs == 1 ? "" : "s", nbrokenpkgs);
out: return 0;
if (iter)
prop_object_iterator_release(iter);
return rv;
} }
int int
@ -96,7 +92,7 @@ check_pkg_integrity(const char *pkgname)
const char *file, *sha256, *reqpkg, *tgt = NULL; const char *file, *sha256, *reqpkg, *tgt = NULL;
char *path, buf[PATH_MAX]; char *path, buf[PATH_MAX];
int rv = 0; int rv = 0;
bool broken = false, files_broken = false; bool broken = false, test_broken = false;
assert(pkgname != NULL); assert(pkgname != NULL);
xhp = xbps_handle_get(); xhp = xbps_handle_get();
@ -113,16 +109,14 @@ check_pkg_integrity(const char *pkgname)
*/ */
propsd = xbps_dictionary_from_metadata_plist(pkgname, XBPS_PKGPROPS); propsd = xbps_dictionary_from_metadata_plist(pkgname, XBPS_PKGPROPS);
if (prop_object_type(propsd) != PROP_TYPE_DICTIONARY) { if (prop_object_type(propsd) != PROP_TYPE_DICTIONARY) {
fprintf(stderr, xbps_error_printf("%s: unexistent %s or invalid metadata "
"E: %s: unexistent %s or invalid metadata file.\n", pkgname, "file.\n", pkgname, XBPS_PKGPROPS);
XBPS_PKGPROPS); broken = true;
rv = errno;
goto out; goto out;
} else if (prop_dictionary_count(propsd) == 0) { } else if (prop_dictionary_count(propsd) == 0) {
fprintf(stderr, xbps_error_printf("%s: incomplete %s metadata file.\n",
"E: %s: incomplete %s metadata file.\n", pkgname, pkgname, XBPS_PKGPROPS);
XBPS_PKGPROPS); broken = true;
rv = EINVAL;
goto out; goto out;
} }
@ -131,16 +125,14 @@ check_pkg_integrity(const char *pkgname)
*/ */
filesd = xbps_dictionary_from_metadata_plist(pkgname, XBPS_PKGFILES); filesd = xbps_dictionary_from_metadata_plist(pkgname, XBPS_PKGFILES);
if (prop_object_type(filesd) != PROP_TYPE_DICTIONARY) { if (prop_object_type(filesd) != PROP_TYPE_DICTIONARY) {
fprintf(stderr, xbps_error_printf("%s: unexistent %s or invalid metadata "
"E: %s: unexistent %s or invalid metadata file.\n", pkgname, "file.\n", pkgname, XBPS_PKGFILES);
XBPS_PKGPROPS); broken = true;
rv = ENOENT;
goto out; goto out;
} else if (prop_dictionary_count(filesd) == 0) { } else if (prop_dictionary_count(filesd) == 0) {
fprintf(stderr, xbps_error_printf("%s: incomplete %s metadata file.\n",
"E: %s: incomplete %s metadata file.\n", pkgname, pkgname, XBPS_PKGFILES);
XBPS_PKGFILES); broken = true;
rv = EINVAL;
goto out; goto out;
} }
@ -151,35 +143,47 @@ check_pkg_integrity(const char *pkgname)
if ((prop_object_type(array) == PROP_TYPE_ARRAY) && if ((prop_object_type(array) == PROP_TYPE_ARRAY) &&
prop_array_count(array) > 0) { prop_array_count(array) > 0) {
iter = xbps_array_iter_from_dict(filesd, "links"); iter = xbps_array_iter_from_dict(filesd, "links");
if (iter == NULL) { if (iter == NULL)
rv = ENOMEM; abort();
goto out;
}
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
if (!prop_dictionary_get_cstring_nocopy(obj, "target", &tgt)) if (!prop_dictionary_get_cstring_nocopy(obj, "target", &tgt))
continue; continue;
prop_dictionary_get_cstring_nocopy(obj, "file", &file); prop_dictionary_get_cstring_nocopy(obj, "file", &file);
if (strcmp(tgt, "") == 0) { if (strcmp(tgt, "") == 0) {
if (xhp->flags & XBPS_FLAG_VERBOSE) xbps_warn_printf("%s: `%s' symlink with "
fprintf(stderr, "%s: `%s' symlink with " "empty target object!\n", pkgname, file);
"empty target object!\n", pkgname,
file);
continue; continue;
} }
if (realpath(file, buf) == NULL) { path = xbps_xasprintf("%s/%s", xhp->rootdir, file);
prop_object_iterator_release(iter); if (path == NULL)
rv = errno; abort();
goto out;
} memset(&buf, 0, sizeof(buf));
if (strcmp(buf, tgt)) { if (realpath(path, buf) == NULL)
fprintf(stderr, "%s: modified symlink `%s', " abort();
free(path);
if (strcmp(xhp->rootdir, "/") && strstr(buf, xhp->rootdir))
path = buf + strlen(xhp->rootdir);
else
path = buf;
if (strcmp(path, tgt)) {
xbps_error_printf("%s: modified symlink `%s', "
"target: `%s' (shall be: `%s')\n", "target: `%s' (shall be: `%s')\n",
pkgname, file, buf, tgt); pkgname, file, tgt, path);
files_broken = true; test_broken = true;
} }
path = NULL;
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
} }
if (test_broken) {
test_broken = false;
xbps_error_printf("%s: links check FAILED.\n", pkgname);
broken = true;
}
/* /*
* Check for missing files and its hash. * Check for missing files and its hash.
@ -188,17 +192,15 @@ check_pkg_integrity(const char *pkgname)
if ((prop_object_type(array) == PROP_TYPE_ARRAY) && if ((prop_object_type(array) == PROP_TYPE_ARRAY) &&
prop_array_count(array) > 0) { prop_array_count(array) > 0) {
iter = xbps_array_iter_from_dict(filesd, "files"); iter = xbps_array_iter_from_dict(filesd, "files");
if (iter == NULL) { if (iter == NULL)
rv = ENOMEM; abort();
goto out;
}
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
prop_dictionary_get_cstring_nocopy(obj, "file", &file); prop_dictionary_get_cstring_nocopy(obj, "file", &file);
path = xbps_xasprintf("%s/%s", xhp->rootdir, file); path = xbps_xasprintf("%s/%s", xhp->rootdir, file);
if (path == NULL) { if (path == NULL) {
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
rv = errno; abort();
goto out;
} }
prop_dictionary_get_cstring_nocopy(obj, prop_dictionary_get_cstring_nocopy(obj,
"sha256", &sha256); "sha256", &sha256);
@ -207,17 +209,17 @@ check_pkg_integrity(const char *pkgname)
case 0: case 0:
break; break;
case ENOENT: case ENOENT:
fprintf(stderr, "%s: unexistent file %s.\n", xbps_error_printf("%s: unexistent file %s.\n",
pkgname, file); pkgname, file);
files_broken = true; test_broken = true;
break; break;
case ERANGE: case ERANGE:
fprintf(stderr, "%s: hash mismatch for %s.\n", xbps_error_printf("%s: hash mismatch for %s.\n",
pkgname, file); pkgname, file);
files_broken = true; test_broken = true;
break; break;
default: default:
fprintf(stderr, xbps_error_printf(
"%s: can't check `%s' (%s)\n", "%s: can't check `%s' (%s)\n",
pkgname, file, strerror(rv)); pkgname, file, strerror(rv));
break; break;
@ -225,10 +227,11 @@ check_pkg_integrity(const char *pkgname)
free(path); free(path);
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
if (files_broken) {
broken = true;
printf("%s: files check FAILED.\n", pkgname);
} }
if (test_broken) {
test_broken = false;
broken = true;
xbps_error_printf("%s: files check FAILED.\n", pkgname);
} }
/* /*
@ -238,26 +241,24 @@ check_pkg_integrity(const char *pkgname)
if (array && prop_object_type(array) == PROP_TYPE_ARRAY && if (array && prop_object_type(array) == PROP_TYPE_ARRAY &&
prop_array_count(array) > 0) { prop_array_count(array) > 0) {
iter = xbps_array_iter_from_dict(filesd, "conf_files"); iter = xbps_array_iter_from_dict(filesd, "conf_files");
if (iter == NULL) { if (iter == NULL)
rv = ENOMEM; abort();
goto out;
}
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
prop_dictionary_get_cstring_nocopy(obj, "file", &file); prop_dictionary_get_cstring_nocopy(obj, "file", &file);
path = xbps_xasprintf("%s/%s", xhp->rootdir, file); path = xbps_xasprintf("%s/%s", xhp->rootdir, file);
if (path == NULL) { if (path == NULL) {
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
rv = ENOMEM; abort();
goto out;
} }
if ((rv = access(path, R_OK)) == -1) { if ((rv = access(path, R_OK)) == -1) {
if (errno == ENOENT) { if (errno == ENOENT) {
fprintf(stderr, xbps_error_printf(
"%s: unexistent file %s\n", "%s: unexistent file %s\n",
pkgname, file); pkgname, file);
broken = true; test_broken = true;
} else } else
fprintf(stderr, xbps_error_printf(
"%s: can't check `%s' (%s)\n", "%s: can't check `%s' (%s)\n",
pkgname, file, pkgname, file,
strerror(errno)); strerror(errno));
@ -265,42 +266,40 @@ check_pkg_integrity(const char *pkgname)
free(path); free(path);
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
if (rv != 0) }
printf("%s: configuration files check FAILED.\n", if (test_broken) {
pkgname); test_broken = false;
xbps_error_printf("%s: conf files check FAILED.\n", pkgname);
broken = true;
} }
/* /*
* Check for missing run time dependencies. * Check for missing run time dependencies.
*/ */
if (xbps_pkg_has_rundeps(propsd)) { if (!xbps_pkg_has_rundeps(propsd))
iter = xbps_array_iter_from_dict(propsd, "run_depends");
if (iter == NULL) {
rv = ENOMEM;
goto out; goto out;
}
iter = xbps_array_iter_from_dict(propsd, "run_depends");
if (iter == NULL)
abort();
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
reqpkg = prop_string_cstring_nocopy(obj); reqpkg = prop_string_cstring_nocopy(obj);
if (reqpkg == NULL) { if (reqpkg == NULL) {
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
rv = EINVAL; abort();
goto out;
} }
rv = xbps_check_is_installed_pkg_by_pattern(reqpkg); if (xbps_check_is_installed_pkg_by_pattern(reqpkg) <= 0) {
if (rv <= 0) { xbps_error_printf("%s: dependency not satisfied: %s\n",
fprintf(stderr,
"%s: dependency not satisfied: %s\n",
pkgname, reqpkg); pkgname, reqpkg);
test_broken = true;
} }
rv = 0;
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
if (rv == ENOENT) { if (test_broken) {
printf("%s: run-time dependency check FAILED.\n", xbps_error_printf("%s: rundeps check FAILED.\n", pkgname);
pkgname);
broken = true; broken = true;
} }
}
out: out:
if (filesd) if (filesd)
@ -308,7 +307,7 @@ out:
if (propsd) if (propsd)
prop_object_release(propsd); prop_object_release(propsd);
if (broken) if (broken)
rv = EINVAL; return -1;
return rv; return 0;
} }