From 3a2e9d805a80e683078994d86a5390bf5deed9fc Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 22 Feb 2013 23:04:53 +0000 Subject: Fix error reporting for client commands by adding a flag to cmd_find_client to tell it whether or not to show errors, sometimes it's needed and sometimes not. --- cmd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cmd.c') diff --git a/cmd.c b/cmd.c index 5c02314f..461d39f6 100644 --- a/cmd.c +++ b/cmd.c @@ -516,15 +516,19 @@ cmd_choose_client(struct clients *cc) /* Find the target client or report an error and return NULL. */ struct client * -cmd_find_client(struct cmd_ctx *ctx, const char *arg) +cmd_find_client(struct cmd_ctx *ctx, const char *arg, int quiet) { struct client *c; char *tmparg; size_t arglen; /* A NULL argument means the current client. */ - if (arg == NULL) - return (cmd_current_client(ctx)); + if (arg == NULL) { + c = cmd_current_client(ctx); + if (c == NULL && !quiet) + ctx->error(ctx, "no clients"); + return (c); + } tmparg = xstrdup(arg); /* Trim a single trailing colon if any. */ @@ -536,7 +540,7 @@ cmd_find_client(struct cmd_ctx *ctx, const char *arg) c = cmd_lookup_client(tmparg); /* If no client found, report an error. */ - if (c == NULL) + if (c == NULL && !quiet) ctx->error(ctx, "client not found: %s", tmparg); free(tmparg); -- cgit