From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wJalF/6IIGBxDgAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 00:42:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id qCdoE/6IIGDlbQAAbx9fmQ (envelope-from ) for ; Mon, 08 Feb 2021 00:42:38 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C5B6494029C for ; Mon, 8 Feb 2021 00:42:37 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id DA2A52065C; Sun, 7 Feb 2021 19:41:48 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 5730F1FD75 for ; Sun, 7 Feb 2021 19:41:29 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 4FD13606DB; Sun, 7 Feb 2021 19:41:29 -0500 (EST) Received: (nullmailer pid 1193276 invoked by uid 1000); Mon, 08 Feb 2021 00:41:15 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 12/23] lib/open: reuse directory checks from n_d_c_with_config Date: Sun, 7 Feb 2021 20:40:58 -0400 Message-Id: <20210208004109.1192719-13-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208004109.1192719-1-david@tethera.net> References: <20210208004109.1192719-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: XLQG5JVSYLT3H4OA2QOVXMOWC5OYWD7K X-Message-ID-Hash: XLQG5JVSYLT3H4OA2QOVXMOWC5OYWD7K X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.95 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: C5B6494029C X-Spam-Score: -0.95 X-Migadu-Scanner: scn1.migadu.com X-TUID: bZGo79jB+N82 Make checks more uniform between creating new databases and opening existing ones. --- lib/open.cc | 50 +++++++++++++++++++++++++++--------------- test/T560-lib-error.sh | 4 ++-- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index f4690763..b5a56e73 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -152,6 +152,29 @@ DONE: return status; } +static notmuch_status_t +_db_dir_exists (const char *database_path, char **message) +{ + struct stat st; + int err; + + err = stat (database_path, &st); + if (err) { + IGNORE_RESULT (asprintf (message, "Error: Cannot open database at %s: %s.\n", + database_path, strerror (errno))); + return NOTMUCH_STATUS_FILE_ERROR; + } + + if (! S_ISDIR (st.st_mode)) { + IGNORE_RESULT (asprintf (message, "Error: Cannot open database at %s: " + "Not a directory.\n", + database_path)); + return NOTMUCH_STATUS_FILE_ERROR; + } + + return NOTMUCH_STATUS_SUCCESS; +} + static notmuch_status_t _choose_database_path (const char *config_path, const char *profile, @@ -379,6 +402,10 @@ notmuch_database_open_with_config (const char *database_path, if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message))) goto DONE; + status = _db_dir_exists (database_path, &message); + if (status) + goto DONE; + notmuch->path = talloc_strdup (notmuch, database_path); strip_trailing (notmuch->path, '/'); @@ -462,9 +489,8 @@ notmuch_database_create_with_config (const char *database_path, char *xapian_path = NULL; char *message = NULL; GKeyFile *key_file = NULL; - struct stat st; - int err; void *local = talloc_new (NULL); + int err; notmuch = _alloc_notmuch (); if (! notmuch) { @@ -475,24 +501,12 @@ notmuch_database_create_with_config (const char *database_path, if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message))) goto DONE; - notmuch->path = talloc_strdup (notmuch, database_path); - strip_trailing (notmuch->path, '/'); - - err = stat (database_path, &st); - if (err) { - IGNORE_RESULT (asprintf (&message, "Error: Cannot create database at %s: %s.\n", - database_path, strerror (errno))); - status = NOTMUCH_STATUS_FILE_ERROR; + status = _db_dir_exists (database_path, &message); + if (status) goto DONE; - } - if (! S_ISDIR (st.st_mode)) { - IGNORE_RESULT (asprintf (&message, "Error: Cannot create database at %s: " - "Not a directory.\n", - database_path)); - status = NOTMUCH_STATUS_FILE_ERROR; - goto DONE; - } + notmuch->path = talloc_strdup (notmuch, database_path); + strip_trailing (notmuch->path, '/'); notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"); diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index ade376ef..03df69d9 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -76,7 +76,7 @@ EOF cat <<'EOF' >EXPECTED == stdout == == stderr == -Error opening database at CWD/nonexistent/foo/.notmuch: No such file or directory +Error: Cannot open database at CWD/nonexistent/foo: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT @@ -111,7 +111,7 @@ EOF cat <<'EOF' >EXPECTED == stdout == == stderr == -Error: Cannot create database at CWD/nonexistent/foo: No such file or directory. +Error: Cannot open database at CWD/nonexistent/foo: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.0