Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 68721429E38 for ; Fri, 2 Dec 2011 13:00:19 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9ENq-8aRYdgR for ; Fri, 2 Dec 2011 13:00:18 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 33515429E21 for ; Fri, 2 Dec 2011 13:00:18 -0800 (PST) Received: by wgbds13 with SMTP id ds13so1494749wgb.2 for ; Fri, 02 Dec 2011 13:00:15 -0800 (PST) Received: by 10.227.204.197 with SMTP id fn5mr7330144wbb.15.1322859612529; Fri, 02 Dec 2011 13:00:12 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi. [80.220.92.23]) by mx.google.com with ESMTPS id 28sm9183237wby.3.2011.12.02.13.00.07 (version=SSLv3 cipher=OTHER); Fri, 02 Dec 2011 13:00:08 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 1/2] cli: add mechanism for running user configurable hooks Date: Fri, 2 Dec 2011 23:00:05 +0200 Message-Id: <7fbe6befcf31881a9bca672f55b93501249a220c.1322859389.git.jani@nikula.org> X-Mailer: git-send-email 1.7.5.4 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2011 21:00:19 -0000 Add support functions for running hooks configurable in the notmuch config file. The hooks will be run using system(1). TODO: * Move notmuch_run_hook() out of notmuch-new.c. It's there and static only because the first user will be there. * Consider merging this with the following patch, as this is slightly artificial as it is. Signed-off-by: Jani Nikula --- notmuch-client.h | 7 +++++++ notmuch-config.c | 21 +++++++++++++++++++++ notmuch-new.c | 25 +++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 0 deletions(-) diff --git a/notmuch-client.h b/notmuch-client.h index b50cb38..5e2fed2 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -87,6 +87,10 @@ typedef struct notmuch_show_params { int decrypt; } notmuch_show_params_t; +typedef enum { + NOTMUCH_HOOK_PLACEHOLDER, +} notmuch_hook_t; + /* There's no point in continuing when we've detected that we've done * something wrong internally (as opposed to the user passing in a * bogus value). @@ -235,6 +239,9 @@ void notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, notmuch_bool_t synchronize_flags); +const char * +notmuch_config_get_hook (notmuch_config_t *config, notmuch_hook_t hook); + notmuch_bool_t debugger_is_active (void); diff --git a/notmuch-config.c b/notmuch-config.c index 1a7ed58..8f1a038 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -608,6 +608,27 @@ notmuch_config_set_new_tags (notmuch_config_t *config, config->new_tags = NULL; } +const char * +notmuch_config_get_hook (notmuch_config_t *config, notmuch_hook_t hook) +{ + char *command; + const char *group, *key; + + switch (hook) { + default: + INTERNAL_ERROR ("Unknown hook %d\n.", hook); + } + + command = g_key_file_get_string (config->key_file, group, key, NULL); + if (command) { + char *p = command; + command = talloc_strdup (config, command); + free (p); + } + + return command; +} + /* Given a configuration item of the form . return the * component group and key. If any error occurs, print a message on * stderr and return 1. Otherwise, return 0. diff --git a/notmuch-new.c b/notmuch-new.c index 81a9350..0c70e64 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -795,6 +795,31 @@ _remove_directory (void *ctx, notmuch_directory_destroy (directory); } +static int +notmuch_run_hook (notmuch_config_t *config, notmuch_hook_t hook) +{ + const char *command; + int r; + + command = notmuch_config_get_hook (config, hook); + if (!command) + return NOTMUCH_STATUS_SUCCESS; /* It's okay not to have a hook */ + + r = system(command); + if (r) { + if (WIFSIGNALED(r)) + fprintf(stderr, "hook '%s' terminated with signal %d\n", + command, WTERMSIG(r)); + else + fprintf(stderr, "hook '%s' failed with status %d\n", + command, WEXITSTATUS(r)); + + r = NOTMUCH_STATUS_FILE_ERROR; /* FIXME */ + } + + return r; +} + int notmuch_new_command (void *ctx, int argc, char *argv[]) { -- 1.7.5.4