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 63293429E26 for ; Sat, 3 Dec 2011 15:16:57 -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 Abxu6SG2Cjho for ; Sat, 3 Dec 2011 15:16:55 -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 62529429E25 for ; Sat, 3 Dec 2011 15:16:55 -0800 (PST) Received: by wgbds13 with SMTP id ds13so3394124wgb.2 for ; Sat, 03 Dec 2011 15:16:54 -0800 (PST) Received: by 10.227.203.70 with SMTP id fh6mr3431301wbb.12.1322954214076; Sat, 03 Dec 2011 15:16:54 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi. [80.220.92.23]) by mx.google.com with ESMTPS id ep16sm18738849wbb.21.2011.12.03.15.16.51 (version=SSLv3 cipher=OTHER); Sat, 03 Dec 2011 15:16:52 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v2 1/2] cli: introduce the concept of user defined hooks Date: Sun, 4 Dec 2011 01:16:48 +0200 Message-Id: <6688b09fffa2a66b496af78008102f88ab4e9450.1322953841.git.jani@nikula.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <7fbe6befcf31881a9bca672f55b93501249a220c.1322859389.git.jani@nikula.org> References: <7fbe6befcf31881a9bca672f55b93501249a220c.1322859389.git.jani@nikula.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sat, 03 Dec 2011 23:16:57 -0000 Add mechanism for running user defined hooks. Hooks are executables or symlinks to executables stored under the new notmuch hooks directory, /.notmuch/hooks. No hooks are introduced here, but adding support for a hook is now a simple matter of calling the new notmuch_run_hook() function at an appropriate location with the hook name. Signed-off-by: Jani Nikula --- v2: Switch to git style hooks in a hook directory as suggested by Austin Clements in IRC. Update manpage and add polish. --- Makefile.local | 1 + notmuch-client.h | 3 ++ notmuch-hook.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 notmuch-hook.c diff --git a/Makefile.local b/Makefile.local index c94402b..a1665e1 100644 --- a/Makefile.local +++ b/Makefile.local @@ -302,6 +302,7 @@ notmuch_client_srcs = \ notmuch-config.c \ notmuch-count.c \ notmuch-dump.c \ + notmuch-hook.c \ notmuch-new.c \ notmuch-reply.c \ notmuch-restore.c \ diff --git a/notmuch-client.h b/notmuch-client.h index b50cb38..a91ad6c 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -235,6 +235,9 @@ void notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, notmuch_bool_t synchronize_flags); +int +notmuch_run_hook (const char *db_path, const char *hook); + notmuch_bool_t debugger_is_active (void); diff --git a/notmuch-hook.c b/notmuch-hook.c new file mode 100644 index 0000000..fc32044 --- /dev/null +++ b/notmuch-hook.c @@ -0,0 +1,63 @@ +/* notmuch - Not much of an email program, (just index and search) + * + * This file is part of notmuch. + * + * Copyright © 2011 Jani Nikula + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/ . + * + * Author: Jani Nikula + */ + +#include "notmuch-client.h" + +int +notmuch_run_hook (const char *db_path, const char *hook) +{ + char *hook_path; + int status = 0; + + if (asprintf (&hook_path, "%s/%s/%s/%s", db_path, ".notmuch", "hooks", + hook) == -1) + return NOTMUCH_STATUS_OUT_OF_MEMORY; + + if (access (hook_path, X_OK) == -1) { + /* Ignore ENOENT. It's okay not to have a hook, hook dir, or even + * notmuch dir. Dangling symbolic links also result in ENOENT, but + * we'll ignore that too for simplicity. */ + if (errno != ENOENT) { + fprintf (stderr, "Error: %s hook access failed: %s\n", hook, + strerror (errno)); + status = NOTMUCH_STATUS_FILE_ERROR; + } + goto DONE; + } + + status = system (hook_path); + if (status) { + if (WIFSIGNALED(status)) + fprintf(stderr, "Error: %s hook terminated with signal %d\n", hook, + WTERMSIG(status)); + else + fprintf(stderr, "Error: %s hook failed with status %d\n", hook, + WEXITSTATUS(status)); + + status = NOTMUCH_STATUS_FILE_ERROR; /* Close enough */ + } + + DONE: + free (hook_path); + + return status; +} -- 1.7.5.4