[hackers] [quark][PATCH] makes host parameters optional

From: <nihal_AT_nihaljere.xyz>
Date: Mon, 13 Apr 2020 22:46:07 -0500

From: Nihal Jere <nihal_AT_nihaljere.xyz>

For me at least, the first valid configuration found by getaddrinfo
works fine most of the time. Obviously if this isn't the configuration
you want, you can specify the host explicitly.

---
 main.c  | 6 +++---
 quark.1 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main.c b/main.c
index eab952d..8b882c0 100644
--- a/main.c
+++ b/main.c
_AT_@ -166,7 +166,7 @@ usage(void)
 	const char *opts = "[-u user] [-g group] [-n num] [-d dir] [-l] "
 	                   "[-i file] [-v vhost] ... [-m map] ...";
 
-	die("usage: %s -h host -p port %s\n"
+	die("usage: %s -p port [-h host] %s\n"
 	    "       %s -U file [-p port] %s", argv0,
 	    opts, argv0, opts);
 }
_AT_@ -266,8 +266,8 @@ main(int argc, char *argv[])
 		usage();
 	}
 
-	/* allow host xor UNIX-domain socket, force port with host */
-	if ((!s.host == !udsname) || (s.host && !s.port)) {
+	/* can't have both host and UDS but must have one of port or UDS*/
+	if ((s.host && udsname) || !(s.port || udsname)) {
 		usage();
 	}
 
diff --git a/quark.1 b/quark.1
index ce315b5..a86f8e7 100644
--- a/quark.1
+++ b/quark.1
_AT_@ -6,8 +6,8 @@
 .Nd simple static web server
 .Sh SYNOPSIS
 .Nm
-.Fl h Ar host
 .Fl p Ar port
+.Op Fl h Ar host
 .Op Fl u Ar user
 .Op Fl g Ar group
 .Op Fl n Ar num
-- 
2.25.2

Received on Tue Apr 14 2020 - 05:46:07 CEST