From c7225ffd120578fefb1d1ead73c1ed84d83de997 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Thu, 30 Apr 2020 17:59:43 -0400
Subject: Rename baseAddress to baseMailto

---
 archive.c | 6 +++---
 archive.h | 2 +-
 atom.c    | 4 ++--
 bubger.1  | 6 +++---
 html.c    | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/archive.c b/archive.c
index c824ecc..f9870a1 100644
--- a/archive.c
+++ b/archive.c
@@ -31,7 +31,7 @@
 
 const char *baseURL = "";
 const char *baseTitle;
-const char *baseAddress;
+const char *baseMailto;
 const char *baseSubscribe;
 
 static uint32_t uidRead(const char *path) {
@@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
 			break; case 'S': search = optarg;
 			break; case 'a': algo = optarg;
 			break; case 'h': concatHead = optarg;
-			break; case 'm': baseAddress = optarg;
+			break; case 'm': baseMailto = optarg;
 			break; case 'p': port = optarg;
 			break; case 'q': exitStatus = EXIT_FAILURE;
 			break; case 's': baseSubscribe = optarg;
@@ -102,7 +102,7 @@ int main(int argc, char *argv[]) {
 	if (!host) errx(EX_USAGE, "host required");
 	if (!user) errx(EX_USAGE, "user required");
 	if (!baseTitle) baseTitle = mailbox;
-	if (!baseAddress) baseAddress = user;
+	if (!baseMailto) baseMailto = user;
 
 	char *pass = NULL;
 	if (passPath) {
diff --git a/archive.h b/archive.h
index 5b7b134..11d5a2b 100644
--- a/archive.h
+++ b/archive.h
@@ -182,7 +182,7 @@ char *templateURL(const char *template, const struct Variable vars[]);
 
 extern const char *baseURL;
 extern const char *baseTitle;
-extern const char *baseAddress;
+extern const char *baseMailto;
 extern const char *baseSubscribe;
 
 #define MBOX_HEADERS \
diff --git a/atom.c b/atom.c
index 7c0dc5e..5b34867 100644
--- a/atom.c
+++ b/atom.c
@@ -159,7 +159,7 @@ int atomIndexOpen(FILE *file) {
 	const char *template = TEMPLATE(
 		<[q]xml version="1.0" encoding="utf-8"[q]>
 		<feed xmlns="http://www.w3.org/2005/Atom">
-		<id>mailto:[addr]</id>
+		<id>mailto:[mailto]</id>
 		<title>[title]</title>
 		<updated>[updated]</updated>
 		<link rel="self" href="[base]/index.atom"/>
@@ -167,7 +167,7 @@ int atomIndexOpen(FILE *file) {
 	);
 	struct Variable vars[] = {
 		{ "q", "?" },
-		{ "addr", baseAddress },
+		{ "mailto", baseMailto },
 		{ "title", baseTitle },
 		{ "updated", atomUpdated(time(NULL)) },
 		{ "base", baseURL },
diff --git a/bubger.1 b/bubger.1
index 3a88e67..99984a8 100644
--- a/bubger.1
+++ b/bubger.1
@@ -61,7 +61,7 @@ to the
 element of HTML pages.
 .
 .It Fl m Ar addr
-Set the mailto address for the archive.
+Set the mailto and reply Cc address for the archive.
 The default address is the username.
 .
 .It Fl p Ar port
@@ -76,8 +76,8 @@ TLS without STARTTLS is assumed.
 Exit non-zero if no changes are made.
 .
 .It Fl s Ar url
-Add a subscribe link
-to the index page navigation.
+Set the subscribe URL link
+to be added to the index page navigation.
 .
 .It Fl t Ar title
 Set the base title for HTML pages.
diff --git a/html.c b/html.c
index 24cdf1a..bbc9662 100644
--- a/html.c
+++ b/html.c
@@ -81,7 +81,7 @@ static char *htmlReply(const struct Envelope *envelope) {
 	struct Variable vars[] = {
 		{ "mailbox", envelope->replyTo.mailbox },
 		{ "host", envelope->replyTo.host },
-		{ "cc", baseAddress },
+		{ "cc", baseMailto },
 		{ "re", (strncmp(envelope->subject, "Re: ", 4) ? "Re: " : "") },
 		{ "subject", envelope->subject },
 		{ "messageID", envelope->messageID },
@@ -515,7 +515,7 @@ static int htmlIndexNav(FILE *file) {
 		if (error) return error;
 	}
 	return 0
-		|| htmlNavItem(file, "write", "mailto:", baseAddress)
+		|| htmlNavItem(file, "write", "mailto:", baseMailto)
 		|| templateRender(file, TEMPLATE(</ul></nav>), NULL, NULL);
 }
 
-- 
cgit 1.4.1