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 E8C41417339 for ; Tue, 30 Mar 2010 01:23:28 -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=ham 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 gSsPgvTqQHlZ for ; Tue, 30 Mar 2010 01:23:28 -0700 (PDT) Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) by olra.theworths.org (Postfix) with ESMTP id E8B15431FC1 for ; Tue, 30 Mar 2010 01:23:27 -0700 (PDT) Received: from localhost (unknown [192.168.200.4]) by max.feld.cvut.cz (Postfix) with ESMTP id 42E1C19F340C; Tue, 30 Mar 2010 10:23:27 +0200 (CEST) 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 0h3kC7ewMWnj; Tue, 30 Mar 2010 10:23:26 +0200 (CEST) Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) by max.feld.cvut.cz (Postfix) with ESMTP id 0E06D19F3403; Tue, 30 Mar 2010 10:23:26 +0200 (CEST) Received: from steelpick.2x.cz (k335-30.felk.cvut.cz [147.32.86.30]) (Authenticated sender: sojkam1) by imap.feld.cvut.cz (Postfix) with ESMTPSA id 0A4AFFA003; Tue, 30 Mar 2010 10:23:26 +0200 (CEST) Received: from wsh by steelpick.2x.cz with local (Exim 4.71) (envelope-from ) id 1NwWjN-0002DX-SB; Tue, 30 Mar 2010 10:23:25 +0200 From: Michal Sojka To: notmuch@notmuchmail.org Date: Tue, 30 Mar 2010 10:23:23 +0200 Message-Id: <1269937403-8495-1-git-send-email-sojkam1@fel.cvut.cz> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <874ojy9q1z.fsf@steelpick.2x.cz> References: <874ojy9q1z.fsf@steelpick.2x.cz> 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: Tue, 30 Mar 2010 08:23:29 -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..5ade168 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -454,6 +454,9 @@ add_files_recursive (notmuch_database_t *notmuch, next = NULL; } + if (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