--- /dev/null
+Return-Path: <novalazy@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 06F4D431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:36 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id SF5CcSdigFkr for <notmuch@notmuchmail.org>;\r
+ Sat, 24 Nov 2012 17:18:35 -0800 (PST)\r
+Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com\r
+ [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 7F6ED431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:35 -0800 (PST)\r
+Received: by mail-pa0-f53.google.com with SMTP id hz1so3911431pad.26\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:18:35 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=0TcysSCFUVeU5fnpLaZFvvTrATxquUbMYeavyoCVhWQ=;\r
+ b=FP05F1yekaVu3enYVbdrnUZXG/Z3oybND03OuQsVdnQqG9f65y3hSORPYreu+bPcsj\r
+ GvYfATftBdVhhgT8vc0NPS1EF4fc5MaiU25m0WU6QgGurNWBAJvIbRHgncS+7vpSMv/h\r
+ Ry81oEB9uOkiVD6bxmN1daYKDih4ewI/Q89hkIFJ9UKeEFK45Z39cQYakN7KfhioZTXE\r
+ 4EF9PRuYNA6LU+WAyVOdKBwzjx6nqkAwUtUjNnLUa7PO2ofcwM22ocAKT7B1Vu7ZzOKM\r
+ ZpTYbjjTnxQnwyadbDfQQyHZNfIlRrcrhJRyuzEzYP8SQvURyNi1Izhg5msfV7jWMP/D\r
+ 7N2w==\r
+Received: by 10.68.209.230 with SMTP id mp6mr26312981pbc.8.1353806315268;\r
+ Sat, 24 Nov 2012 17:18:35 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+ [220.233.42.215])\r
+ by mx.google.com with ESMTPS id oj1sm6231031pbb.19.2012.11.24.17.18.32\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 24 Nov 2012 17:18:34 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 16/20] insert: trap SIGINT and clean up\r
+Date: Sun, 25 Nov 2012 12:16:42 +1100\r
+Message-Id: <1353806206-29133-17-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 25 Nov 2012 01:18:36 -0000\r
+\r
+The only potentially long-running part of the 'insert' command should be\r
+copying stdin to the 'tmp' file. If SIGINT is received during the\r
+copying process, abort and clean up the file in 'tmp'. At all other\r
+points, just ignore the signal and continue.\r
+---\r
+ notmuch-insert.c | 27 +++++++++++++++++++++++++--\r
+ 1 file changed, 25 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 831b322..28653ee 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -24,6 +24,21 @@\r
+ #include <sys/stat.h>\r
+ #include <fcntl.h>\r
+ \r
++static volatile sig_atomic_t interrupted;\r
++\r
++static void\r
++handle_sigint (unused (int sig))\r
++{\r
++ static char msg[] = "Stopping... \n";\r
++\r
++ /* This write is "opportunistic", so it's okay to ignore the\r
++ * result. It is not required for correctness, and if it does\r
++ * fail or produce a short write, we want to get out of the signal\r
++ * handler as quickly as possible, not retry it. */\r
++ IGNORE_RESULT (write (2, msg, sizeof (msg) - 1));\r
++ interrupted = 1;\r
++}\r
++\r
+ /* Like gethostname but guarantees that a null-terminated hostname is\r
+ * returned, even if it has to make one up.\r
+ * Returns true unless hostname contains a slash. */\r
+@@ -241,7 +256,7 @@ copy_fd_data (int fdin, int fdout)\r
+ ssize_t remain;\r
+ ssize_t written;\r
+ \r
+- for (;;) {\r
++ while (! interrupted) {\r
+ remain = read (fdin, buf, sizeof(buf));\r
+ if (remain == 0)\r
+ break;\r
+@@ -270,7 +285,7 @@ copy_fd_data (int fdin, int fdout)\r
+ } while (remain > 0);\r
+ }\r
+ \r
+- return TRUE;\r
++ return ! interrupted;\r
+ }\r
+ \r
+ /* Add the specified message file to the notmuch database, applying tags.\r
+@@ -382,6 +397,7 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+ {\r
+ notmuch_config_t *config;\r
+ notmuch_database_t *notmuch;\r
++ struct sigaction action;\r
+ const char *db_path;\r
+ const char **new_tags;\r
+ size_t new_tags_length;\r
+@@ -428,6 +444,13 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+ return 1;\r
+ }\r
+ \r
++ /* Setup our handler for SIGINT */\r
++ memset (&action, 0, sizeof (struct sigaction));\r
++ action.sa_handler = handle_sigint;\r
++ sigemptyset (&action.sa_mask);\r
++ action.sa_flags = SA_RESTART;\r
++ sigaction (SIGINT, &action, NULL);\r
++\r
+ config = notmuch_config_open (ctx, NULL, NULL);\r
+ if (config == NULL)\r
+ return 1;\r
+-- \r
+1.7.12.1\r
+\r
projects / notmuch-archives.git / commitdiff