playground/suckless-quark
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

permit prefix to be empty in -v format string

Browse source 
The previous parsing of the -v vhosts made sure there were 4 tokens.
If there was no prefix specified, usage() is called.  Now, it only
checks for the firsts 3, with .prefix set to null if there are only
3 tokens.
This commit is contained in:
Josuah Demangeon 2018-04-02 02:55:00 +02:00 committed by Laslo Hunhold
parent 69bb7710eb
commit c3ddb2dd14
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main.c
View file

@ -172,9 +172,11 @@ main(int argc, char *argv[])
} }
if (!(s.vhost[s.vhost_len - 1].chost = strtok(tok, " ")) || if (!(s.vhost[s.vhost_len - 1].chost = strtok(tok, " ")) ||
!(s.vhost[s.vhost_len - 1].regex = strtok(NULL, " ")) || !(s.vhost[s.vhost_len - 1].regex = strtok(NULL, " ")) ||
!(s.vhost[s.vhost_len - 1].dir = strtok(NULL, " ")) || !(s.vhost[s.vhost_len - 1].dir = strtok(NULL, " "))) {
!(s.vhost[s.vhost_len - 1].prefix = strtok(NULL, " ")) || usage();
strtok(NULL, "")) { }
s.vhost[s.vhost_len - 1].prefix = strtok(NULL, " ");
if (strtok(NULL, "")) {
usage(); usage();
} }
break; break;

2
quark.1
View file

@ -96,7 +96,7 @@ The default is "nobody".
Add the virtual host specified by Add the virtual host specified by
.Ar vhost , .Ar vhost ,
which has the form which has the form
.Qq Pa chost regex dir prefix , .Qq Pa chost regex dir [prefix] ,
where each element is separated with whitespace. where each element is separated with whitespace.
.Pp .Pp
A request matching the virtual host regular expression A request matching the virtual host regular expression