Deduplicate code and make some minor improvements

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 7 insertions, 130 deletions

diff --git a/set-contact-chats.c b/set-contact-chats.c
index d2811d0..a4e0f8d 100644
--- a/set-contact-chats.c
+++ b/set-contact-chats.c
@@ -1,133 +1,10 @@
 /* See LICENSE file for copyright and license details. */
-#include "common.h"
-
-USAGE("[-A old-address] [-C old-context] [-S old-service] ([-a new-adress] [-c new-context] [-s new-service] | -u) contact-id");
-
-
-int
-main(int argc, char *argv[])
-{
-	int add = 1, edit = 0, remove = 0;
-	char *address = NULL, *context = NULL, *service = NULL;
-	char *lookup_address = NULL, *lookup_context = NULL, *lookup_service = NULL;
-	char *old_address = NULL, *old_context = NULL, *old_service = NULL;
-	struct passwd *user;
-	struct libcontacts_contact contact;
-	struct libcontacts_chat **r, **w;
-	size_t i;
-
-	ARGBEGIN {
-	case 'A':
-		add = 0;
-		if (lookup_address)
-			usage();
-		lookup_address = ARG();
-		break;
-	case 'a':
-		edit = 1;
-		if (address)
-			usage();
-		address = ARG();
-		break;
-	case 'C':
-		add = 0;
-		if (lookup_context)
-			usage();
-		lookup_context = ARG();
-		break;
-	case 'c':
-		edit = 1;
-		if (context)
-			usage();
-		context = ARG();
-		break;
-	case 'S':
-		add = 0;
-		if (lookup_service)
-			usage();
-		lookup_service = ARG();
-		break;
-	case 's':
-		edit = 1;
-		if (service)
-			usage();
-		service = ARG();
-		break;
-	case 'u':
-		remove = 1;
-		break;
-	default:
-		usage();
-	} ARGEND;
-
-	if (remove == edit) {
-		if (edit)
-			usage();
-		eprintf("at least one of -acsu is required\n");
-	}
-
-	if (add)
-		edit = 0;
+#define CATEGORY chats
 
-	if (argc != 1 || !*argv[0] || strchr(argv[0], '/'))
-		usage();
+#define LIST_PARAMS(X)\
+	X('A', "A", 'a', "a", address, "address")\
+	X('S', "S", 's', "s", service, "service")\
+	X('C', "C", 'c', "c", context, "context")
 
-	errno = 0;
-	user = getpwuid(getuid());
-	if (!user)
-		eprintf("getpwuid: %s\n", errno ? strerror(errno) : "user does not exist");
-
-	if (libcontacts_load_contact(argv[0], &contact, user))
-		eprintf("libcontacts_load_contact %s: %s\n", argv[0], errno ? strerror(errno) : "contact file is malformatted");
-
-	i = 0;
-	if ((edit || remove) && contact.chats) {
-		for (r = contact.chats; *r; r++) {
-			if (lookup_context && strcmpnul((*r)->context, lookup_context))
-				continue;
-			if (lookup_address && strcmpnul((*r)->context, lookup_address))
-				continue;
-			break;
-		}
-		if (!edit) {
-			libcontacts_chat_destroy(*r);
-			free(*r);
-			for (w = r++; (*w++ = *r++););
-		} else if (*r) {
-			if (context) {
-				old_context = contact.chats[i]->context;
-				contact.chats[i]->context = context;
-			}
-			if (service) {
-				old_service = contact.chats[i]->service;
-				contact.chats[i]->service = service;
-			}
-			if (address) {
-				old_address = contact.chats[i]->address;
-				contact.chats[i]->address = address;
-			}
-		} else {
-			libcontacts_contact_destroy(&contact);
-			return 0;
-		}
-	} else if (!edit && !remove) {
-		if (contact.chats)
-			for (i = 0; contact.chats[i]; i++);
-		contact.chats = erealloc(contact.chats, (i + 2) * sizeof(*contact.chats));
-		contact.chats[i + 1] = NULL;
-		contact.chats[i] = ecalloc(1, sizeof(**contact.chats));
-		contact.chats[i]->context = context;
-		contact.chats[i]->service = service;
-		contact.chats[i]->address = address;
-	}
-
-	if (libcontacts_save_contact(&contact, user))
-		eprintf("libcontacts_save_contact %s:", argv[0]);
-
-	contact.chats[i]->context = old_context;
-	contact.chats[i]->service = old_service;
-	contact.chats[i]->address = old_address;
-	libcontacts_contact_destroy(&contact);
-
-	return 0;
-}
+#include "common.h"
+IMPLEMENT_SET_ON_LIST(chat)