Merge branch 'master' into new/parallel

Author: mmdbalkhi

.github/workflows/codeql.yaml

@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
     container:
-      image: ghcr.io/void-linux/void-glibc-full:20240526R1
+      image: ghcr.io/void-linux/void-glibc-full:20260210R1
     steps:
     - name: Prepare container
       run: |
@@ -30,21 +30,22 @@ jobs:
         # node-based actions require libstdc++.so.6
         # codeql runs some bash scripts
         xbps-install -Sy \
-          libstdc++ bash git \
+          libstdc++ bash git atf-devel kyua \
           gcc make pkg-config zlib-devel openssl-devel libarchive-devel
     - name: Checkout repository
       uses: actions/checkout@v3
     - run: git config --global --add safe.directory $(pwd)
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
-        languages: cpp
+        languages: c-cpp
+        build-mode: manual
         config-file: ./.github/codeql/codeql-config.yaml
     - name: Build xbps
       run: |
-          ./configure
+          ./configure --enable-tests
           make -j
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:cpp"

bin/xbps-checkvers/main.c

@@ -537,8 +537,8 @@ static int
 rcv_check_version(rcv_t *rcv)
 {
 	const char *repover = NULL;
-	char srcver[BUFSIZ] = { '\0' }, *binpkgname = NULL, *s = NULL;
-	const char *pkgname, *version, *revision, *reverts, *repourl;
+	char srcver[BUFSIZ] = { '\0' }, *binpkgname = NULL;
+	const char *pkgname, *version, *revision, *reverts, *repourl, *s;
 	int sz;
 	size_t len;
 
@@ -660,8 +660,8 @@ template_removed_cb(struct xbps_handle *xhp UNUSED,
 		void *arg,
 		bool *done UNUSED)
 {
+	const char *last_dash;
 	char *pkgname;
-	char *last_dash;
 	bool dummy_bool = false;
 	rcv_t *rcv = arg;
 

bin/xbps-create/main.c

@@ -235,7 +235,7 @@ process_one_alternative(const char *altgrname, const char *val)
 {
 	xbps_dictionary_t d;
 	xbps_array_t a;
-	char *altfiles;
+	const char *altfiles;
 	bool alloc = false;
 
 	if ((d = xbps_dictionary_get(pkg_propsd, "alternatives")) == NULL) {
@@ -575,7 +575,7 @@ walk_dir(const char *path,
 {
 	char tmp_path[PATH_MAX] = "";
 	struct stat sb;
-	struct dirent **list;
+	struct dirent **list = NULL;
 	int rv = 0;
 	int n;
 

bin/xbps-install/transaction.c

@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <ctype.h>
 #include <assert.h>
 #include <unistd.h>
 #include <limits.h>
@@ -317,9 +316,7 @@ dist_upgrade(struct xbps_handle *xhp, unsigned int cols, bool yes, bool drun)
 		xbps_error_printf("No packages currently registered.\n");
 		return 0;
 	} else if (rv == EBUSY) {
-		if (drun) {
-			rv = 0;
-		} else {
+		if (!drun) {
 			xbps_error_printf("The 'xbps' package must be updated, please run `xbps-install -u xbps`\n");
 			return rv;
 		}

bin/xbps-remove/clean-cache.c

@@ -102,6 +102,8 @@ cleaner_cb(struct xbps_handle *xhp, xbps_object_t obj,
 		pkgd = xbps_pkgdb_get_pkg(xhp, binpkgver);
 	} else {
 		pkgd = xbps_rpool_get_pkg(xhp, binpkgver);
+		if (!pkgd)
+			pkgd = xbps_pkgdb_get_pkg(xhp, binpkgver);
 	}
 	if (pkgd) {
 		xbps_dictionary_get_cstring_nocopy(pkgd,
@@ -143,20 +145,42 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
 	DIR *dirp;
 	struct dirent *dp;
 	char *ext;
-	int rv = 0;
+	int r;
 
 	// XXX: there is no public api to load the pkgdb so force it before
 	// its done potentially concurrently by threads through the
 	// xbps_array_foreach_cb_multi call later.
-	(void)xbps_pkgdb_get_pkg(xhp, "foo");
+	// XXX: same for the repository pool...
+	if (uninstalled) {
+		(void)xbps_pkgdb_get_pkg(xhp, "package-that-wont-exist");
+	} else {
+		(void)xbps_rpool_get_pkg(xhp, "package-that-wont-exist-so-it-loads-all-repos");
+		(void)xbps_pkgdb_get_pkg(xhp, "package-that-wont-exist");
+	}
 
-	if (chdir(xhp->cachedir) == -1)
-		return -1;
+	if (chdir(xhp->cachedir) == -1) {
+		if (errno == ENOENT)
+			return 0;
+		r = -errno;
+		xbps_error_printf("failed to change to cache directory: %s: %s\n",
+		    xhp->cachedir, strerror(-r));
+		return r;
+	}
 
-	if ((dirp = opendir(xhp->cachedir)) == NULL)
-		return 0;
+	dirp = opendir(".");
+	if (!dirp) {
+		r = -errno;
+		xbps_error_printf("failed to open cache directory: %s: %s\n",
+		    xhp->cachedir, strerror(-r));
+		return r;
+	}
 
 	array = xbps_array_create();
+	if (!array) {
+		(void)closedir(dirp);
+		return xbps_error_oom();
+	}
+
 	while ((dp = readdir(dirp)) != NULL) {
 		if ((strcmp(dp->d_name, ".") == 0) ||
 		    (strcmp(dp->d_name, "..") == 0))
@@ -169,7 +193,11 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
 			xbps_dbg_printf("ignoring unknown file: %s\n", dp->d_name);
 			continue;
 		}
-		xbps_array_add_cstring(array, dp->d_name);
+		if (!xbps_array_add_cstring(array, dp->d_name)) {
+			xbps_object_release(array);
+			(void)closedir(dirp);
+			return xbps_error_oom();
+		}
 	}
 	(void)closedir(dirp);
 
@@ -178,8 +206,11 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
 			.dry = drun,
 			.uninstalled = uninstalled,
 		};
-		rv = xbps_array_foreach_cb_multi(xhp, array, NULL, cleaner_cb, (void*)&data);
-		xbps_object_release(array);
+		r = xbps_array_foreach_cb_multi(xhp, array, NULL, cleaner_cb, (void*)&data);
+	} else {
+		r = 0;
 	}
-	return rv;
+
+	xbps_object_release(array);
+	return r;
 }

bin/xbps-uchroot/main.c

@@ -212,7 +212,8 @@ static void
 add_bindmount(const char *bm, bool ro)
 {
 	struct bindmnt *bmnt;
-	char *b, *src, *dest;
+	const char *dest, *b;
+	char *src;
 	size_t len;
 
 	src = strdup(bm);

include/xbps.h.in

@@ -781,6 +781,16 @@ int xbps_error_errno(int r, const char *fmt, ...)  PRINTF_LIKE(2, 3);
 	xbps_error_errno(ENOMEM, "%s:%d %s: out of memory\n", __FILE__,        \
 	        __LINE__, __func__)
 
+/**
+ * @brief Log and abort for code that should be unreachable.
+ */
+#define xbps_unreachable()                                                     \
+	do {                                                                   \
+		xbps_error_printf("%s:%d %s: code should not be reached\n",    \
+		    __FILE__, __LINE__, __func__);                             \
+		abort();                                                       \
+	} while (0)
+
 /**@}*/
 
 /** @addtogroup configure */

lib/archive.c

@@ -57,7 +57,7 @@ xbps_archive_get_file(struct archive *ar, struct archive_entry *entry)
 
 	buf = malloc(len + 1);
 	if (!buf) {
-		xbps_error_printf("out of memory\n");
+		xbps_error_oom();
 		errno = ENOMEM;
 		return NULL;
 	}

lib/conf.c

@@ -61,19 +61,19 @@ vpkg_map_add(xbps_dictionary_t d, const char *pkgname, const char *vpkgver, cons
 	if (!providers) {
 		providers = xbps_dictionary_create();
 		if (!providers)
-			return -ENOMEM;
+			return xbps_error_oom();
 
 		if (!xbps_dictionary_set(d, pkgname, providers)) {
 			xbps_object_release(providers);
-			return -ENOMEM;
+			return xbps_error_oom();
 		}
 		alloc = true;
 	}
 
 	if (!xbps_dictionary_set_cstring(providers, vpkgver, provider)) {
 		if (alloc)
 			xbps_object_release(providers);
-		return -ENOMEM;
+		return xbps_error_oom();
 	}
 
 	if (alloc)
@@ -249,9 +249,10 @@ cmpkey(const void *a, const void *b)
 static int
 parse_option(char *line, size_t linelen, char **valp, size_t *vallen)
 {
-	size_t len;
+	struct key needle;
+	const struct key *result;
 	char *p;
-	struct key needle, *result;
+	size_t len;
 
 	p = strpbrk(line, " \t=");
 	if (p == NULL)

lib/fetch/fetch.c

@@ -161,10 +161,6 @@ fetchList(struct url_list *ue, struct url *URL, const char *pattern,
 		return (fetchListFile(ue, URL, pattern, flags));
 	else if (strcasecmp(URL->scheme, SCHEME_FTP) == 0)
 		return (fetchListFTP(ue, URL, pattern, flags));
-	else if (strcasecmp(URL->scheme, SCHEME_HTTP) == 0)
-		return (fetchListHTTP(ue, URL, pattern, flags));
-	else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0)
-		return (fetchListHTTP(ue, URL, pattern, flags));
 	url_seterr(URL_BAD_SCHEME);
 	return -1;
 }