Make host parameters optional - quark - quark web server
HTML git clone git://git.suckless.org/quark
DIR Log
DIR Files
DIR Refs
DIR LICENSE
---
DIR commit 8ccef4b27a72f339b820f91c82330a3a5b592f7b
DIR parent 48e74a598247f4b81e09a0f652faf15163f9f525
HTML Author: Nihal Jere <nihal@nihaljere.xyz>
Date: Tue, 21 Apr 2020 17:04:37 +0200
Make host parameters optional
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.
Diffstat:
M main.c | 6 +++---
M quark.1 | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/main.c b/main.c
@@ -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);
}
@@ -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();
}
DIR diff --git a/quark.1 b/quark.1
@@ -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