From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3341E138239 for ; Sun, 12 May 2019 09:59:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B7C2E0828; Sun, 12 May 2019 09:59:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C443DE0827 for ; Sun, 12 May 2019 09:59:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42A7F344122 for ; Sun, 12 May 2019 09:58:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E0785E3 for ; Sun, 12 May 2019 09:58:57 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1557655104.0dd41363d51b4d49fd5db414a4680d30ec78edd2.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: quse.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 0dd41363d51b4d49fd5db414a4680d30ec78edd2 X-VCS-Branch: master Date: Sun, 12 May 2019 09:58:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c71e9ce2-22b0-428e-9520-9c4ed6fb00bf X-Archives-Hash: f9dee3be46e7752b35f5e4bf6d19b023 commit: 0dd41363d51b4d49fd5db414a4680d30ec78edd2 Author: Fabian Groffen gentoo org> AuthorDate: Sun May 12 09:58:24 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun May 12 09:58:24 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=0dd41363 quse: use tree_get_atom and atom_format Signed-off-by: Fabian Groffen gentoo.org> quse.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/quse.c b/quse.c index 6def799..c7fbe81 100644 --- a/quse.c +++ b/quse.c @@ -420,16 +420,12 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv) int portdirfd = -1; /* pacify compiler */ if (state->match || verbose) { - snprintf(buf, sizeof(buf), "%s/%s", - pkg_ctx->cat_ctx->name, pkg_ctx->name); - atom = atom_explode(buf); + atom = tree_get_atom(pkg_ctx, 0); if (atom == NULL) return 0; if (state->match) { match = atom_compare(atom, state->match) == EQUAL; - if (!verbose || !match) - atom_implode(atom); if (!match) return 0; @@ -517,13 +513,17 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv) } if (match) { - char *repo = state->do_repo ? pkg_ctx->repo : NULL; + const char *qfmt; + + atom = tree_get_atom(pkg_ctx, state->do_repo); + if (state->do_repo) { + qfmt = "%[CATEGORY]%[PF]%[REPO]"; + } else { + qfmt = "%[CATEGORY]%[PF]"; + } if (quiet) { - printf("%s%s/%s%s%s%s%s%s\n", BOLD, pkg_ctx->cat_ctx->name, - BLUE, pkg_ctx->name, - repo ? RED : "", repo ? "::" : "", repo ? repo : "", - NORM); + printf("%s\n", atom_format(qfmt, atom, 0)); } else if (verbose && !state->do_licence) { /* multi-line result, printing USE-flags with their descs */ struct quse_state us = { @@ -537,10 +537,7 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv) .overlay = NULL, }; - printf("%s%s/%s%s%s%s%s%s\n", BOLD, pkg_ctx->cat_ctx->name, - BLUE, pkg_ctx->name, - repo ? RED : "", repo ? "::" : "", repo ? repo : "", - NORM); + printf("%s\n", atom_format(qfmt, atom, 0)); q = p = meta->IUSE; buf[0] = '\0'; @@ -584,16 +581,11 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv) free(us.retv); free(us.argv); } else { - printf("%s%s/%s%s%s%s%s%s: %s\n", BOLD, pkg_ctx->cat_ctx->name, - BLUE, pkg_ctx->name, - repo ? RED : "", repo ? "::" : "", repo ? repo : "", - NORM, v); + printf("%s: %s\n", atom_format(qfmt, atom, 0), v); } } tree_close_meta(meta); - if (state->match && verbose) - atom_implode(atom); if (verbose) close(portdirfd);