From ef15b4195f1453bf6f81cfd1e456c049922aa574 Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 16 Jan 2017 14:52:25 +0000 Subject: Revert WIP parts of previous I didn't mean to commit yet. --- client.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index c7774177..551a01b2 100644 --- a/client.c +++ b/client.c @@ -252,13 +252,16 @@ client_main(struct event_base *base, int argc, char **argv, int flags, * flag. */ cmdlist = cmd_list_parse(argc, argv, NULL, 0, &cause); - if (cmdlist != NULL) { - TAILQ_FOREACH(cmd, &cmdlist->list, qentry) { - if (cmd->entry->flags & CMD_STARTSERVER) - cmdflags |= CMD_STARTSERVER; - } - cmd_list_free(cmdlist); + if (cmdlist == NULL) { + fprintf(stderr, "%s\n", cause); + return (1); + } + cmdflags &= ~CMD_STARTSERVER; + TAILQ_FOREACH(cmd, &cmdlist->list, qentry) { + if (cmd->entry->flags & CMD_STARTSERVER) + cmdflags |= CMD_STARTSERVER; } + cmd_list_free(cmdlist); } /* Create client process structure (starts logging). */ -- cgit v1.2.3