From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WNOHFegXTmAKdAAA0tVLHw (envelope-from ) for ; Sun, 14 Mar 2021 14:04:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MHNBEegXTmDXQQAAB5/wlQ (envelope-from ) for ; Sun, 14 Mar 2021 14:04:24 +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) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BE0C01CFA0 for ; Sun, 14 Mar 2021 15:04:23 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id F06D928C9D; Sun, 14 Mar 2021 10:03:00 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id B78C827590 for ; Sun, 14 Mar 2021 10:02:37 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id B0D065FA96; Sun, 14 Mar 2021 10:02:37 -0400 (EDT) Received: (nullmailer pid 183653 invoked by uid 1000); Sun, 14 Mar 2021 14:02:19 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 10/22] lib/open: reuse directory checks from n_d_c_with_config Date: Sun, 14 Mar 2021 11:02:05 -0300 Message-Id: <20210314140217.183425-11-david@tethera.net> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210314140217.183425-1-david@tethera.net> References: <20210314140217.183425-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: LHFD4HIABDFRMQSRY3NCPZZTHVOO56X7 X-Message-ID-Hash: LHFD4HIABDFRMQSRY3NCPZZTHVOO56X7 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615730663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nBt2GfogvEkuJdJpy4ZmLgQDlDa5oZSvK3h5pdyyUvE=; b=R8JdKjYwHcmZx/1xMnCF7++Ey4xkKVk2tSiYus7O1PE4aDCz/qjHFetK47N+E+pX5tDfWV BXBamsFI/tDt4L2DH2AHtz8pERdl1h/OMiZuT+RXBq8TYcz9Fg3Vl58aol4ZsXlBfJdiJS ia7gAAQCNC19RFpATzDVGEMlH1xTr+i+zLGfzjPGkTUthZGyR57jrlifiRdUySe0vcTETR lAu9SAu8umX8tdbk1keQwyl+VPvg58IK/N/JAUbz0Erae+0OzgEUL++AXRGRTGU7rhCGgl SjkdMux09SA9l+C9H7HRqZW8jSwJxPCpd16QjNIt0HjWMgyq5uY6KnCVDuGLGQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615730663; a=rsa-sha256; cv=none; b=jh7+NZaCodNN22L+IeheJ1hPwN5dtmhVS/ARmojU535I3nhskYpvgP4jBfnFkz7z9Oan6m LRWUbHuNon7+S+lN8DNBskCuU4axBuBaLnunCEsAN46S1W7Yd6wGBdZsZQ1ZG0+zb+bGoi mmYIIjjBt1Tp8cqqyWRt8f5DL/aGVQpFTLtz15AZnSbJR0wI7rdAQq1AdmUGqduEd3O17a GSM5jh6ilIMokgMiO+u1ziPUBUZuYTs4dWfmxru7YQhyljwqvZGkycE+1onKQu7LsZ8SZE BwWoT/1YwEfP6xJ0qfE/gkDOiRZeS/6tS1j2fi/s7O/PmIqOaPqtClUgUFpnlw== ARC-Authentication-Results: i=1; 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-Spam-Score: -1.00 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: BE0C01CFA0 X-Spam-Score: -1.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: FJwAPYiAplCC Make checks more uniform between creating new databases and opening existing ones. --- lib/open.cc | 66 ++++++++++++++++++++++++++-------------- test/T030-config.sh | 2 +- test/T560-lib-error.sh | 4 +-- test/T750-user-header.sh | 2 +- 4 files changed, 47 insertions(+), 27 deletions(-) diff --git a/lib/open.cc b/lib/open.cc index f48b97ae..0defa9c0 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -152,6 +152,29 @@ _load_key_file (const char *path, 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 (void *ctx, const char *config_path, @@ -251,8 +274,6 @@ notmuch_database_open_with_config (const char *database_path, notmuch_database_t *notmuch = NULL; char *notmuch_path, *incompat_features; char *message = NULL; - struct stat st; - int err; unsigned int version; GKeyFile *key_file = NULL; @@ -270,19 +291,19 @@ notmuch_database_open_with_config (const char *database_path, _set_database_path (notmuch, database_path); + status = _db_dir_exists (database_path, &message); + if (status) + goto DONE; + if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) { message = strdup ("Out of memory\n"); status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; } - err = stat (notmuch_path, &st); - if (err) { - IGNORE_RESULT (asprintf (&message, "Error opening database at %s: %s\n", - notmuch_path, strerror (errno))); - status = NOTMUCH_STATUS_FILE_ERROR; + status = _db_dir_exists (notmuch_path, &message); + if (status) goto DONE; - } if (! (notmuch->xapian_path = talloc_asprintf (local, "%s/%s", notmuch_path, "xapian"))) { message = strdup ("Out of memory\n"); @@ -471,9 +492,16 @@ notmuch_database_create_with_config (const char *database_path, char *notmuch_path = NULL; char *message = NULL; GKeyFile *key_file = NULL; - struct stat st; - int err; void *local = talloc_new (NULL); + int err; + + _init_libs (); + + notmuch = _alloc_notmuch (); + if (! notmuch) { + status = NOTMUCH_STATUS_OUT_OF_MEMORY; + goto DONE; + } _init_libs (); @@ -481,21 +509,11 @@ notmuch_database_create_with_config (const char *database_path, &key_file, &database_path, &message))) goto DONE; - 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; - } + _set_database_path (notmuch, database_path); notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"); @@ -503,6 +521,8 @@ notmuch_database_create_with_config (const char *database_path, if (err) { if (errno == EEXIST) { status = NOTMUCH_STATUS_DATABASE_EXISTS; + talloc_free (notmuch); + notmuch = NULL; } else { IGNORE_RESULT (asprintf (&message, "Error: Cannot create directory %s: %s.\n", notmuch_path, strerror (errno))); diff --git a/test/T030-config.sh b/test/T030-config.sh index 32efa945..6610bf8e 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -61,7 +61,7 @@ built_with.compact=something built_with.field_processor=something built_with.retry_lock=something ==== -Error opening database at MAIL_DIR/.notmuch: No such file or directory +Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT 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 diff --git a/test/T750-user-header.sh b/test/T750-user-header.sh index ff554b06..b19db571 100755 --- a/test/T750-user-header.sh +++ b/test/T750-user-header.sh @@ -5,7 +5,7 @@ test_description='indexing user specified headers' test_begin_subtest "error adding user header before initializing DB" notmuch config set index.header.List List-Id 2>&1 | notmuch_dir_sanitize > OUTPUT cat < EXPECTED -Error opening database at MAIL_DIR/.notmuch: No such file or directory +Error: Cannot open database at MAIL_DIR/.notmuch: No such file or directory. EOF test_expect_equal_file EXPECTED OUTPUT -- 2.30.1