dovecot-2.2: doveadm exec: Show help if binary name wasn't given.

dovecot at dovecot.org dovecot at dovecot.org
Thu Aug 21 18:57:25 UTC 2014


details:   http://hg.dovecot.org/dovecot-2.2/rev/787ebba12684
changeset: 17745:787ebba12684
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 21 20:56:40 2014 +0200
description:
doveadm exec: Show help if binary name wasn't given.

diffstat:

 src/doveadm/doveadm.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r f82f8409334c -r 787ebba12684 src/doveadm/doveadm.c
--- a/src/doveadm/doveadm.c	Thu Aug 21 20:54:46 2014 +0200
+++ b/src/doveadm/doveadm.c	Thu Aug 21 20:56:40 2014 +0200
@@ -174,10 +174,18 @@
 	cmd_config, "config", "[doveconf parameters]"
 };
 
+static void cmd_exec(int argc ATTR_UNUSED, char *argv[]);
+static struct doveadm_cmd doveadm_cmd_exec = {
+	cmd_exec, "exec", "<binary> [binary parameters]"
+};
+
 static void cmd_exec(int argc ATTR_UNUSED, char *argv[])
 {
 	const char *path, *binary = argv[1];
 
+	if (binary == NULL)
+		help(&doveadm_cmd_exec);
+
 	path = t_strdup_printf("%s/%s", doveadm_settings->libexec_dir, binary);
 	argv++;
 	argv[0] = t_strdup_noconst(path);
@@ -185,10 +193,6 @@
 	i_fatal("execv(%s) failed: %m", argv[0]);
 }
 
-static struct doveadm_cmd doveadm_cmd_exec = {
-	cmd_exec, "exec", "<binary> [binary parameters]"
-};
-
 static bool
 doveadm_try_run_multi_word(const struct doveadm_cmd *cmd,
 			   const char *cmdname, int argc, char *argv[])


More information about the dovecot-cvs mailing list