From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id E1E1E429E3E for ; Tue, 6 Dec 2011 05:23:00 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 SLSef9Wrk9je for ; Tue, 6 Dec 2011 05:23:00 -0800 (PST) Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 0A638429E27 for ; Tue, 6 Dec 2011 05:22:59 -0800 (PST) Received: by faaa5 with SMTP id a5so330913faa.26 for ; Tue, 06 Dec 2011 05:22:58 -0800 (PST) Received: by 10.227.197.76 with SMTP id ej12mr1753604wbb.27.1323177766413; Tue, 06 Dec 2011 05:22:46 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi. [80.220.92.23]) by mx.google.com with ESMTPS id w8sm14764789wiz.4.2011.12.06.05.22.44 (version=SSLv3 cipher=OTHER); Tue, 06 Dec 2011 05:22:45 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v3 1/2] cli: introduce the concept of user defined hooks Date: Tue, 6 Dec 2011 15:22:37 +0200 Message-Id: X-Mailer: git-send-email 1.7.5.4 In-Reply-To: References: <7fbe6befcf31881a9bca672f55b93501249a220c.1322859389.git.jani@nikula.org> In-Reply-To: References: 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: Tue, 06 Dec 2011 13:23:01 -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 --- Makefile.local | 1 + hooks.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ notmuch-client.h | 3 ++ 3 files changed, 97 insertions(+), 0 deletions(-) create mode 100644 hooks.c diff --git a/Makefile.local b/Makefile.local index c94402b..60ae9cb 100644 --- a/Makefile.local +++ b/Makefile.local @@ -298,6 +298,7 @@ notmuch_client_srcs = \ debugger.c \ gmime-filter-reply.c \ gmime-filter-headers.c \ + hooks.c \ notmuch.c \ notmuch-config.c \ notmuch-count.c \ diff --git a/hooks.c b/hooks.c new file mode 100644 index 0000000..c2d59c1 --- /dev/null +++ b/hooks.c @@ -0,0 +1,93 @@ +/* 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" +#include + +int +notmuch_run_hook (const char *db_path, const char *hook) +{ + char *hook_path; + int status = 0; + pid_t pid; + + hook_path = talloc_asprintf (NULL, "%s/%s/%s/%s", db_path, ".notmuch", + "hooks", hook); + if (hook_path == NULL) { + fprintf (stderr, "Out of memory\n"); + return 1; + } + + /* Check access before fork() for speed and simplicity of error handling. */ + 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 = 1; + } + goto DONE; + } + + pid = fork(); + if (pid == -1) { + fprintf (stderr, "Error: %s hook fork failed: %s\n", hook, + strerror (errno)); + status = 1; + goto DONE; + } else if (pid == 0) { + execl (hook_path, hook_path, NULL); + /* Same as above for ENOENT, but unlikely now. Indicate all other errors + * to parent through non-zero exit status. */ + if (errno != ENOENT) { + fprintf (stderr, "Error: %s hook execution failed: %s\n", hook, + strerror (errno)); + status = 1; + } + exit (status); + } + + if (waitpid (pid, &status, 0) == -1) { + fprintf (stderr, "Error: %s hook wait failed: %s\n", hook, + strerror (errno)); + status = 1; + goto DONE; + } + + if (!WIFEXITED (status) || WEXITSTATUS (status)) { + if (WEXITSTATUS (status)) { + fprintf (stderr, "Error: %s hook failed with status %d\n", + hook, WEXITSTATUS (status)); + } else if (WIFSIGNALED (status)) { + fprintf (stderr, "Error: %s hook terminated with signal %d\n", + hook, WTERMSIG (status)); + } + status = 1; + } + + DONE: + talloc_free (hook_path); + + return status; +} 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); -- 1.7.5.4