[gentoo-commits] proj/portage-utils:master commit in: /, tests/qmanifest/

[gentoo-commits] proj/portage-utils:master commit in: /, tests/qmanifest/

[Fabian Groffen]

commit:     f46111eb2e10cfd8317f728e0638b947ac47ab62
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 10:03:59 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 10:03:59 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f46111eb

tests: fix after last commit

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 q.c                             | 2 +-
 tests/qmanifest/manifest04.good | 2 +-
 tests/qmanifest/manifest05.good | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/q.c b/q.c
index 6d7eced..a6a9a0b 100644
--- a/q.c
+++ b/q.c
@@ -62,7 +62,7 @@ APPLET lookup_applet(const char *applet)
 	/* this is possibly an alias like "belongs"
 	 * NOTE: we continue where the previous loop left, e.g. on the first
 	 * alias (desc == NULL) */
-	for ( ; applets[i].name != NULL; i++) {
+	for (/*i*/; applets[i].name != NULL; i++) {
 		if (strcmp(applets[i].name, applet) == 0) {
 			unsigned int j;
 

diff --git a/tests/qmanifest/manifest04.good b/tests/qmanifest/manifest04.good
index 4831674..613d7a9 100644
--- a/tests/qmanifest/manifest04.good
+++ b/tests/qmanifest/manifest04.good
@@ -1 +1 @@
-manifest: cannot change directory to not_a_tree: No such file or directory
+qmanifest: cannot change directory to not_a_tree: No such file or directory

diff --git a/tests/qmanifest/manifest05.good b/tests/qmanifest/manifest05.good
index 77a54c5..4849a71 100644
--- a/tests/qmanifest/manifest05.good
+++ b/tests/qmanifest/manifest05.good
@@ -1 +1 @@
-manifest: no such overlay: notatree
+qmanifest: no such overlay: notatree

[gentoo-commits] proj/portage-utils:master commit in: /, tests/qmanifest/

[Fabian Groffen]

commit:     55e64136dc0bf63a563da1faff1e7a4fb1ce6a9c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 09:03:16 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 09:03:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=55e64136

main: replace iniparser by a small bit of custom code

This make portage-utils dep-free (when qmanifest/qtegrity are not
compiled in) again, thus easier for the static binary case.

Small bonus is that the repo order is now deterministic (as found in the
config file(s)), which may help reduce test differences.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 TODO.md                         |  3 +-
 main.c                          | 89 ++++++++++++++++++++++++++++++-----------
 tests/qmanifest/manifest00.good |  2 +-
 3 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/TODO.md b/TODO.md
index 00ccdea..dffaa91 100644
--- a/TODO.md
+++ b/TODO.md
@@ -19,7 +19,8 @@
   to use foreach\_pkg and get\_atom -- set is ready for storing objects
   now
 
-- implement our own iniparser so we *can* be dep-free
+- replace all strtok by strtok\_r, because the latter is already used,
+  so we can
 
 # Atoms
 

diff --git a/main.c b/main.c
index f0a8841..c6ef973 100644
--- a/main.c
+++ b/main.c
@@ -10,7 +10,6 @@
 #include "main.h"
 #include "applets.h"
 
-#include <iniparser.h>
 #include <xalloc.h>
 #include <assert.h>
 #include <ctype.h>
@@ -540,7 +539,7 @@ read_portage_profile(const char *profile, env_vars vars[], set *masks)
 	 * treat parent profiles as defaults, that can be overridden by
 	 * *this* profile. */
 	strcpy(profile_file + profile_len, "parent");
-	if (eat_file(profile_file, &buf, &buf_len) == 0) {
+	if (!eat_file(profile_file, &buf, &buf_len)) {
 		if (buf != NULL)
 			free(buf);
 		return;
@@ -637,37 +636,82 @@ set *package_masks = NULL;
 static void
 read_one_repos_conf(const char *repos_conf, char **primary)
 {
-	int nsec;
-	char *conf;
 	char rrepo[_Q_PATH_MAX];
-	const char *main_repo;
-	const char *repo;
-	const char *path;
-	dictionary *dict;
+	char *main_repo;
+	char *repo;
+	char *buf = NULL;
+	size_t buf_len = 0;
+	char *s;
+	char *p;
+	char *q;
+	char *r;
+	char *e;
+	bool do_trim;
+	bool is_default;
 
 	if (getenv("DEBUG"))
 		fprintf(stderr, "  parse %s\n", repos_conf);
 
-	dict = iniparser_load(repos_conf);
+	if (!eat_file(repos_conf, &buf, &buf_len)) {
+		if (buf != NULL)
+			free(buf);
+		return;
+	}
 
-	main_repo = iniparser_getstring(dict, "DEFAULT:main-repo", NULL);
+	main_repo = NULL;
+	repo = NULL;
+	for (p = strtok_r(buf, "\n", &s); p != NULL; p = strtok_r(NULL, "\n", &s))
+	{
+		/* trim trailing whitespace, remove comments, locate = */
+		do_trim = true;
+		e = NULL;
+		for (r = q = s - 2; q >= p; q--) {
+			if (do_trim && isspace((int)*q)) {
+				*q = '\0';
+				r = q - 1;
+			} else if (*q == '#') {
+				do_trim = true;
+				*q = '\0';
+				r = q - 1;
+			} else {
+				if (*q == '=')
+					e = q;
+				do_trim = false;
+			}
+		}
+		/* make q point to the last char */
+		q = r;
 
-	nsec = iniparser_getnsec(dict);
-	while (nsec-- > 0) {
-		repo = iniparser_getsecname(dict, nsec);
-		if (strcmp(repo, "DEFAULT") == 0)  /* already handled above */
+		if (*p == '[' && *q == ']') {  /* section header */
+			repo = p + 1;
+			*q = '\0';
+			is_default = strcmp(repo, "DEFAULT") == 0;
+			continue;
+		} else if (*p == '\0') {       /* empty line */
+			continue;
+		} else if (e == NULL) {        /* missing = */
 			continue;
+		} else if (repo == NULL) {     /* not in a section */
+			continue;
+		}
 
-		xasprintf(&conf, "%s:location", repo);
-		path = iniparser_getstring(dict, conf, NULL);
-		if (path) {
+		/* trim off whitespace before = */
+		for (r = e - 1; r >= p && isspace((int)*r); r--)
+			*r = '\0';
+		/* and after the = */
+		for (e++; e < q && isspace((int)*e); e++)
+			;
+
+		if (is_default && strcmp(p, "main-repo") == 0) {
+			main_repo = e;
+		} else if (!is_default && strcmp(p, "location") == 0) {
 			void *ele;
 			size_t n;
 			char *overlay;
 
 			/* try not to get confused by symlinks etc. */
-			if (realpath(path, rrepo) != NULL)
-				path = rrepo;
+			if (realpath(e, rrepo) != NULL)
+				e = rrepo;
 
 			array_for_each(overlay_names, n, overlay) {
 				if (strcmp(overlay, repo) == 0)
@@ -681,19 +725,18 @@ read_one_repos_conf(const char *repos_conf, char **primary)
 				array_get_elem(overlay_src, n) = xstrdup(repos_conf);
 				ele = array_get_elem(overlays, n);
 				free(ele);
-				ele = array_get_elem(overlays, n) = xstrdup(path);
+				ele = array_get_elem(overlays, n) = xstrdup(e);
 			} else {
-				ele = xarraypush_str(overlays, path);
+				ele = xarraypush_str(overlays, e);
 				overlay = xarraypush_str(overlay_names, repo);
 				xarraypush_str(overlay_src, repos_conf);
 			}
 			if (main_repo && strcmp(repo, main_repo) == 0)
 				*primary = overlay;
 		}
-		free(conf);
 	}
 
-	iniparser_freedict(dict);
+	free(buf);
 }
 
 /* Handle a possible directory of files. */

diff --git a/tests/qmanifest/manifest00.good b/tests/qmanifest/manifest00.good
index 31ab76f..0e89a93 100644
--- a/tests/qmanifest/manifest00.good
+++ b/tests/qmanifest/manifest00.good
@@ -1,2 +1,2 @@
-not_a_tree: /notatree
 bad_tree: /simpletree (main)
+not_a_tree: /notatree