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 2E8B54196F2 for ; Fri, 26 Mar 2010 14:18:25 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5 tests=[BAYES_00=-1.9] autolearn=unavailable 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 wbQETRvKdczK for ; Fri, 26 Mar 2010 14:18:23 -0700 (PDT) Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) by olra.theworths.org (Postfix) with ESMTP id C6CD04196F3 for ; Fri, 26 Mar 2010 14:18:23 -0700 (PDT) Received: from localhost (unknown [192.168.200.4]) by max.feld.cvut.cz (Postfix) with ESMTP id 2ADFC19F342E; Fri, 26 Mar 2010 22:18:22 +0100 (CET) X-Virus-Scanned: IMAP AMAVIS Received: from max.feld.cvut.cz ([192.168.200.1]) by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new, port 10044) with ESMTP id SLj3g81tDk4t; Fri, 26 Mar 2010 22:18:20 +0100 (CET) Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) by max.feld.cvut.cz (Postfix) with ESMTP id D9EAF19F35E6; Fri, 26 Mar 2010 22:18:20 +0100 (CET) Received: from steelpick.2x.cz (r5da224.net.upc.cz [86.49.116.224]) (Authenticated sender: sojkam1) by imap.feld.cvut.cz (Postfix) with ESMTPSA id 38FC215C062; Fri, 26 Mar 2010 22:18:20 +0100 (CET) Received: from wsh by steelpick.2x.cz with local (Exim 4.71) (envelope-from ) id 1NvGv5-00067q-MK; Fri, 26 Mar 2010 22:18:19 +0100 From: Michal Sojka To: notmuch@notmuchmail.org Date: Fri, 26 Mar 2010 22:18:13 +0100 Message-Id: <1269638293-23520-1-git-send-email-sojkam1@fel.cvut.cz> X-Mailer: git-send-email 1.7.0.2 Subject: [notmuch] [PATCH] Prevent data loss caused by SIGINT during notmuch new 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, 26 Mar 2010 21:18:25 -0000 When Ctrl-C is pressed in a wrong time during notmuch new, it can lead to removal of messages from the database even if the files were not removed. It happened at least once to me. Signed-off-by: Michal Sojka --- notmuch-new.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/notmuch-new.c b/notmuch-new.c index 44b50aa..ae89654 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -454,6 +454,9 @@ add_files_recursive (notmuch_database_t *notmuch, next = NULL; } + if (state->interrupted) + goto DONE; + /* Now that we've walked the whole filesystem list, anything left * over in the database lists has been deleted. */ while (notmuch_filenames_valid (db_files)) -- 1.7.0.2