xbps-pkgdb: add check selection.

Add the --checks option to xbps-pkgdb, which allows the user to select
which package checks should be run. It works for a single package as
well as with the --all option.

Co-authored-by: Duncaen Overbruck <[email protected]>

Author: ericonr

bin/xbps-pkgdb/check.c

@@ -35,16 +35,22 @@
 #include <xbps.h>
 #include "defs.h"
 
+struct check_context {
+	int errors;
+	unsigned ctr;
+};
+
 static int
-pkgdb_cb(struct xbps_handle *xhp UNUSED,
+check_cb(struct xbps_handle *xhp UNUSED,
 		xbps_object_t obj,
 		const char *key UNUSED,
 		void *arg,
 		bool *done UNUSED)
 {
 	const char *pkgver = NULL;
 	char pkgname[XBPS_NAME_SIZE];
-	int rv, *errors = (int *)arg;
+	struct check_context *ctx = arg;
+	int rv;
 
 	xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
 	if (xhp->flags & XBPS_FLAG_VERBOSE)
@@ -53,24 +59,28 @@ pkgdb_cb(struct xbps_handle *xhp UNUSED,
 	if (!xbps_pkg_name(pkgname, sizeof(pkgname), pkgver)) {
 		abort();
 	}
-	if ((rv = check_pkg_integrity(xhp, obj, pkgname)) != 0)
-		*errors += 1;
+	if ((rv = check_pkg(xhp, obj, pkgname, ctx->ctr)) != 0)
+		ctx->errors += 1;
 
 	return 0;
 }
 
 int
-check_pkg_integrity_all(struct xbps_handle *xhp)
+check_all(struct xbps_handle *xhp, unsigned int checks)
 {
-	int errors = 0;
-	xbps_pkgdb_foreach_cb_multi(xhp, pkgdb_cb, &errors);
-	return errors ? -1 : 0;
+	struct check_context args = {
+		.errors = 0,
+		.ctr = checks,
+	};
+	xbps_pkgdb_foreach_cb_multi(xhp, check_cb, &args);
+	return args.errors ? -1 : 0;
 }
 
 int
-check_pkg_integrity(struct xbps_handle *xhp,
+check_pkg(struct xbps_handle *xhp,
 		    xbps_dictionary_t pkgd,
-		    const char *pkgname)
+		    const char *pkgname,
+		    unsigned checks)
 {
 	xbps_dictionary_t opkgd, filesd;
 	const char *sha256;
@@ -116,24 +126,27 @@ check_pkg_integrity(struct xbps_handle *xhp,
 		}
 	}
 
-#define RUN_PKG_CHECK(x, name, arg)				\
-do {								\
-	if (check_pkg_##name(x, pkgname, arg)) { 	\
-		errors++;					\
-	}							\
-} while (0)
-
-	/* Execute pkg checks */
-	RUN_PKG_CHECK(xhp, files, filesd);
-	RUN_PKG_CHECK(xhp, symlinks, filesd);
-	RUN_PKG_CHECK(xhp, rundeps, opkgd);
-	RUN_PKG_CHECK(xhp, unneeded, opkgd);
-	RUN_PKG_CHECK(xhp, alternatives, opkgd);
+	if (checks & CHECK_FILES) {
+		if (check_pkg_files(xhp, pkgname, filesd))
+			errors++;
+		if (check_pkg_symlinks(xhp, pkgname, filesd))
+			errors++;
+	}
+	if (checks & CHECK_DEPENDENCIES) {
+		if (check_pkg_rundeps(xhp, pkgname, opkgd))
+			errors++;
+	}
+	if (checks & CHECK_ALTERNATIVES) {
+		if (check_pkg_alternatives(xhp, pkgname, opkgd))
+			errors++;
+	}
+	if (checks & CHECK_PKGDB) {
+		if (check_pkg_unneeded(xhp, pkgname, opkgd))
+			errors++;
+	}
 
 	if (filesd)
 		xbps_object_release(filesd);
 
-#undef RUN_PKG_CHECK
-
 	return !!errors;
 }

bin/xbps-pkgdb/check_pkg_alternatives.c

@@ -24,15 +24,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <sys/param.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <libgen.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <assert.h>
 #include <unistd.h>
-#include <libgen.h>
-#include <sys/param.h>
 
 #include <xbps.h>
 #include "defs.h"
@@ -153,10 +154,9 @@ check_symlinks(struct xbps_handle *xhp, const char *pkgname, xbps_array_t a,
 }
 
 int
-check_pkg_alternatives(struct xbps_handle *xhp, const char *pkgname, void *arg)
+check_pkg_alternatives(struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t pkg_propsd)
 {
 	xbps_array_t allkeys, array;
-	xbps_dictionary_t pkg_propsd = arg;
 	xbps_dictionary_t alternatives, pkg_alternatives;
 	int rv = 0;
 

bin/xbps-pkgdb/check_pkg_files.c

@@ -22,14 +22,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include <sys/param.h>
 
-#include <stdio.h>
+#include <errno.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <unistd.h>
-#include <sys/param.h>
 
 #include <xbps.h>
 #include "defs.h"
@@ -49,12 +49,11 @@
  */
 
 int
-check_pkg_files(struct xbps_handle *xhp, const char *pkgname, void *arg)
+check_pkg_files(struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t pkg_filesd)
 {
 	xbps_array_t array;
 	xbps_object_t obj;
 	xbps_object_iterator_t iter;
-	xbps_dictionary_t pkg_filesd = arg;
 	const char *file = NULL, *sha256 = NULL;
 	char *path;
 	bool mutable, test_broken = false;

bin/xbps-pkgdb/check_pkg_rundeps.c

@@ -23,14 +23,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <sys/param.h>
+
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <assert.h>
 #include <unistd.h>
-#include <sys/param.h>
 
 #include <xbps.h>
 #include "defs.h"
@@ -45,9 +44,8 @@
  */
 
 int
-check_pkg_rundeps(struct xbps_handle *xhp, const char *pkgname, void *arg)
+check_pkg_rundeps(struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t pkg_propsd)
 {
-	xbps_dictionary_t pkg_propsd = arg;
 	xbps_array_t array;
 	const char *reqpkg = NULL;
 	int rv = 0;

bin/xbps-pkgdb/check_pkg_symlinks.c

@@ -23,15 +23,15 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
+#include <sys/param.h>
+
+#include <assert.h>
+#include <libgen.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <assert.h>
 #include <unistd.h>
-#include <libgen.h>
-#include <sys/param.h>
 
 #include <xbps.h>
 #include "defs.h"
@@ -47,11 +47,10 @@
  */
 
 int
-check_pkg_symlinks(struct xbps_handle *xhp, const char *pkgname, void *arg)
+check_pkg_symlinks(struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t filesd)
 {
 	xbps_array_t array;
 	xbps_object_t obj;
-	xbps_dictionary_t filesd = arg;
 	int rv = 0;
 
 	array = xbps_dictionary_get(filesd, "links");

bin/xbps-pkgdb/check_pkg_unneeded.c

@@ -23,14 +23,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/param.h>
+
 #include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 #include <assert.h>
 #include <unistd.h>
-#include <sys/param.h>
 
 #include <xbps.h>
 #include "defs.h"
@@ -43,10 +43,9 @@
  * 	  and remove them if that was true.
  */
 int
-check_pkg_unneeded(struct xbps_handle *xhp UNUSED, const char *pkgname, void *arg)
+check_pkg_unneeded(struct xbps_handle *xhp UNUSED, const char *pkgname, xbps_dictionary_t pkgd)
 {
 	xbps_array_t replaces;
-	xbps_dictionary_t pkgd = arg;
 	const char *repo = NULL;
 	char *buf;
 

bin/xbps-pkgdb/defs.h

@@ -29,18 +29,29 @@
 #include <sys/time.h>
 #include <xbps.h>
 
+enum {
+	CHECK_FILES = 1 << 0,
+	CHECK_DEPENDENCIES = 1 << 1,
+	CHECK_ALTERNATIVES = 1 << 2,
+	CHECK_PKGDB = 1 << 3,
+};
+
 /* from check.c */
-int	check_pkg_integrity(struct xbps_handle *, xbps_dictionary_t, const char *);
-int	check_pkg_integrity_all(struct xbps_handle *);
+int check_pkg(struct xbps_handle *, xbps_dictionary_t, const char *, unsigned);
+int check_all(struct xbps_handle *, unsigned);
 
-#define CHECK_PKG_DECL(type)			\
-int check_pkg_##type (struct xbps_handle *, const char *, void *)
+int check_pkg_unneeded(
+    struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t pkgd);
+int check_pkg_files(
+    struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t filesd);
+int check_pkg_symlinks(
+    struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t filesd);
+int check_pkg_rundeps(
+    struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t pkgd);
+int check_pkg_alternatives(
+    struct xbps_handle *xhp, const char *pkgname, xbps_dictionary_t pkgd);
 
-CHECK_PKG_DECL(unneeded);
-CHECK_PKG_DECL(files);
-CHECK_PKG_DECL(rundeps);
-CHECK_PKG_DECL(symlinks);
-CHECK_PKG_DECL(alternatives);
+int get_checks_to_run(unsigned *, char *);
 
 /* from convert.c */
 void	convert_pkgdb_format(struct xbps_handle *);