From 61f01795fcc16e714cb7f826f944345f5d23ed9b Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Sat, 4 Jan 2020 16:16:49 -0500
Subject: Add -N option to litterbox

---
 litterbox.1 | 9 ++++++++-
 litterbox.c | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/litterbox.1 b/litterbox.1
index a5b287f..6501850 100644
--- a/litterbox.1
+++ b/litterbox.1
@@ -1,4 +1,4 @@
-.Dd January 3, 2020
+.Dd January 4, 2020
 .Dt LITTERBOX 1
 .Os
 .
@@ -9,6 +9,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Qqv
+.Op Fl N Ar network
 .Op Fl d Ar path
 .Op Fl h Ar host
 .Op Fl j Ar join
@@ -45,6 +46,12 @@ an existing database can be migrated with
 The arguments are as follows:
 .
 .Bl -tag -width "-h host"
+.It Fl N Ar network
+Set the network name to be used
+if the server does not send
+.Sy RPL_ISUPPORT NETWORK .
+The default is the server hostname.
+.
 .It Fl Q
 Enable the public search query interface.
 This allows anyone to perform searches
diff --git a/litterbox.c b/litterbox.c
index c6cee84..4c97794 100644
--- a/litterbox.c
+++ b/litterbox.c
@@ -618,15 +618,17 @@ int main(int argc, char *argv[]) {
 	bool insecure = false;
 	const char *host = NULL;
 	const char *port = "6697";
+	const char *defaultNetwork = NULL;
 
 	const char *nick = "litterbox";
 	const char *user = NULL;
 	const char *pass = NULL;
 
 	int opt;
-	while (0 < (opt = getopt(argc, argv, "!Qd:h:ij:l:mn:p:qu:vw:"))) {
+	while (0 < (opt = getopt(argc, argv, "!N:Qd:h:ij:l:mn:p:qu:vw:"))) {
 		switch (opt) {
 			break; case '!': insecure = true;
+			break; case 'N': defaultNetwork = optarg;
 			break; case 'Q': searchQuery = Public;
 			break; case 'd': path = optarg;
 			break; case 'h': host = optarg;
@@ -665,7 +667,7 @@ int main(int argc, char *argv[]) {
 
 	if (!host) errx(EX_USAGE, "host required");
 	set(&self, "*");
-	set(&network, host);
+	set(&network, (defaultNetwork ? defaultNetwork : host));
 	set(&chanTypes, "#&");
 	set(&prefixes, "@+");
 
-- 
cgit 1.4.1