From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oJmTN7xC0GFAPAAAgWs5BA (envelope-from ) for ; Sat, 01 Jan 2022 13:02:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SOUCNLxC0GEAbwEAauVa8A (envelope-from ) for ; Sat, 01 Jan 2022 13:02:04 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (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 93C2D311E0 for ; Sat, 1 Jan 2022 13:02:04 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 2AA9C5F72E; Sat, 1 Jan 2022 12:01:47 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 0691B5F710 for ; Sat, 1 Jan 2022 12:01:45 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 3D18C5FC50; Sat, 1 Jan 2022 07:01:44 -0500 (EST) Received: (nullmailer pid 38206 invoked by uid 1000); Sat, 01 Jan 2022 12:01:40 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 2/3] lib/config: add known config key "show.extra_headers" Date: Sat, 1 Jan 2022 08:01:35 -0400 Message-Id: <20220101120136.37988-3-david@tethera.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220101120136.37988-1-david@tethera.net> References: <20220101120136.37988-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: G2KM6CWD3ZE44VPJK4JZBMBAVC4OKQKO X-Message-ID-Hash: G2KM6CWD3ZE44VPJK4JZBMBAVC4OKQKO 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; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641038524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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-owner:list-unsubscribe:list-subscribe:list-post; bh=8mjwkLGMnwnLE9J63lnAsmRFNwWJwSb/S6vQplzltZ8=; b=aPDjjNsfefGISY0Vp84cxFz/K6beYIlJHLcBaAJQvUxuXg+QTHXWM01iF7TW2Ze7mu9PX/ 7O0wQA8jzb2zCO8HBkvjQYNp52Z2fKcdsfAnTj11ujTSqwvoI5B/erw/6Kp22W75B45dZl 7ATsRreuAcRqI21hAUb3y4EZbB3tsmRa9bwxNETNkjbm5PZkHeMpNtCqNQLxFU2JBbfUuw oJbf0VCXBbleslw5yZ0sKUg6fK73Bl/WYmV8H4SlCCHm+4e58pAmUi7A6mFO24bYHmuG/U lE3lfYWKhyCkEHx0+OUFRX42BGrZpC2wk2+X+TIpgwZfyqyfu76LtGOfjqSOFQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641038524; a=rsa-sha256; cv=none; b=r+eGgV/J9F0vHMLZG78QxP+QHeYdK4ce9AuSCZpeQiVPQf7BDuDdd6dhPCDpGftBUUamvs +9ZfvJRqmCxHnZZ7YBOQ9sRPKUfgfKaMcAJOj+Ei3dCfXtq6kFRemw9A3gdTgbXNQaok6t r7MEN0v0tIGz8J82gCSCJy9uqKk78Hn0BPlxkYkQ80VFJ/QcNiG7fliT/URlWU0f6ra8Gu Yc27qtecOU2IrwLE3x93cDlKJrhWf5tzQxCWr7VvRClV+b+iBKa4l7vleAmXk0xWXNpLxR L0mqELVzoTl0CxsC3e7DTTaX0V9L1EleuWQMfzxiRWU3SsNjd1RDG6T9RzYBog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.21 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 93C2D311E0 X-Spam-Score: -1.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: bUWdgW+Pu6ET Used in a following commit to enable including extra headers beyond the default in structured output. --- lib/config.cc | 3 +++ lib/notmuch.h | 1 + test/T590-libconfig.sh | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/lib/config.cc b/lib/config.cc index 7a2882de..97060f8b 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -596,6 +596,8 @@ _notmuch_config_key_to_string (notmuch_config_key_t key) return "user.name"; case NOTMUCH_CONFIG_AUTOCOMMIT: return "database.autocommit"; + case NOTMUCH_CONFIG_EXTRA_HEADERS: + return "show.extra_headers"; default: return NULL; } @@ -643,6 +645,7 @@ _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key) return ""; case NOTMUCH_CONFIG_AUTOCOMMIT: return "8000"; + case NOTMUCH_CONFIG_EXTRA_HEADERS: case NOTMUCH_CONFIG_HOOK_DIR: case NOTMUCH_CONFIG_BACKUP_DIR: case NOTMUCH_CONFIG_OTHER_EMAIL: diff --git a/lib/notmuch.h b/lib/notmuch.h index 1b2bdf3f..a75a42be 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -2546,6 +2546,7 @@ typedef enum { NOTMUCH_CONFIG_OTHER_EMAIL, NOTMUCH_CONFIG_USER_NAME, NOTMUCH_CONFIG_AUTOCOMMIT, + NOTMUCH_CONFIG_EXTRA_HEADERS, NOTMUCH_CONFIG_LAST } notmuch_config_key_t; diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index eb303444..7ee4bb11 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -439,6 +439,7 @@ cat <<'EOF' >EXPECTED 09: 'NULL' 10: 'USER_FULL_NAME' 11: '8000' +12: 'NULL' == stderr == EOF unset MAILDIR @@ -749,6 +750,7 @@ cat <<'EOF' >EXPECTED 09: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org' 10: 'Notmuch Test Suite' 11: '8000' +12: 'NULL' == stderr == EOF test_expect_equal_file EXPECTED OUTPUT @@ -782,6 +784,7 @@ cat <<'EOF' >EXPECTED 09: 'NULL' 10: 'USER_FULL_NAME' 11: '8000' +12: 'NULL' == stderr == EOF test_expect_equal_file EXPECTED OUTPUT.clean @@ -858,6 +861,7 @@ maildir.synchronize_flags true new.ignore sekrit_junk new.tags unread;inbox search.exclude_tags foo;bar;fub +show.extra_headers (null) test.key1 testvalue1 test.key2 testvalue2 user.name Notmuch Test Suite -- 2.34.1