From fa88a28e46b7ac2d3dcd1938e5e4708157d08b22 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 12 Apr 2021 13:37:59 +0200 Subject: Deduplicate code and make some small improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- get-contact-pgpkeys.c | 91 ++++----------------------------------------------- 1 file changed, 6 insertions(+), 85 deletions(-) (limited to 'get-contact-pgpkeys.c') diff --git a/get-contact-pgpkeys.c b/get-contact-pgpkeys.c index e0a3961..28586d0 100644 --- a/get-contact-pgpkeys.c +++ b/get-contact-pgpkeys.c @@ -1,88 +1,9 @@ /* See LICENSE file for copyright and license details. */ -#include "common.h" - -USAGE("[-c context] [-f fingerprint] [-CF] contact-id ..."); - - -int -main(int argc, char *argv[]) -{ - int display_ctx = 0, display_id = 0; - const char *lookup_ctx = NULL, *lookup_id = NULL; - struct passwd *user; - struct libcontacts_contact contact; - struct libcontacts_pgpkey **keys, *key; - int ret = 0; - size_t i; - - ARGBEGIN { - case 'c': - if (lookup_ctx) - usage(); - lookup_ctx = ARG(); - break; - case 'f': - if (lookup_id) - usage(); - lookup_id = ARG(); - break; - case 'C': - display_ctx = 1; - break; - case 'F': - display_id = 1; - break; - default: - usage(); - } ARGEND; +#define CATEGORY pgpkeys - if (!argc) - usage(); +#define LIST_PARAMS(X)\ + X('C', "C", 'c', "c", context, "context")\ + X('F', "F", 'f', "f", id, "fingerprint") - if (lookup_ctx && !lookup_id && !display_ctx && !display_id) - display_id = 1; - if (lookup_id && !lookup_ctx && !display_ctx && !display_id) - display_ctx = 1; - - for (i = 0; argv[i]; i++) - if (!*argv[i] || strchr(argv[i], '/')) - usage(); - - errno = 0; - user = getpwuid(getuid()); - if (!user) - eprintf("getpwuid: %s\n", errno ? strerror(errno) : "user does not exist"); - - for (; *argv; argv++) { - if (libcontacts_load_contact(*argv, &contact, user)) { - weprintf("libcontacts_load_contact %s: %s\n", *argv, errno ? strerror(errno) : "contact file is malformatted"); - ret = 1; - continue; - } - if ((keys = contact.pgpkeys)) { - for (; (key = *keys); keys++) { - if (lookup_ctx && strcmpnul(key->context, lookup_ctx)) - continue; - if (lookup_id && strcmpnul(key->id, lookup_id)) - continue; - if (lookup_ctx && lookup_id && !display_ctx && !display_id) { - printf("%s\n", *argv); - continue; - } - if (argc > 1) - printf("%s: ", *argv); - if (!display_ctx == !display_id) - printf("%s: %s\n", key->context, key->id); - else if (display_id) - printf("%s\n", key->id); - else - printf("%s\n", key->context); - } - } - libcontacts_contact_destroy(&contact); - } - - if (fflush(stdout) || ferror(stdout) || fclose(stdout)) - eprintf("printf:"); - return ret; -} +#include "common.h" +IMPLEMENT_GET_ON_LIST(pgpkey) -- cgit v1.2.3-70-g09d2