summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2015-08-20 15:11:40 -0400
committerGravatar Adam Chlipala <adam@chlipala.net>2015-08-20 15:11:40 -0400
commit98230036ecde51e20e749f8817d11215d4b74265 (patch)
tree6b1244adc92aa2a1f47d751efc7083c9b6c7c5c2
parentd3ea9c25ab1e6fd7a2a1de603dcbf76891d8bfd5 (diff)
Beautify '-h' output for web servers
-rw-r--r--src/c/http.c2
-rw-r--r--src/settings.sml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/c/http.c b/src/c/http.c
index e6c7b1af..9059746f 100644
--- a/src/c/http.c
+++ b/src/c/http.c
@@ -314,7 +314,7 @@ static void *worker(void *data) {
}
static void help(char *cmd) {
- printf("Usage: %s [-p <port>] [-a <IP address>] [-t <thread count>] [-k] [-q] [-T SEC]\nThe '-k' option turns on HTTP keepalive.\nThe '-q' option turns off some chatter on stdout.\nThe -T option sets socket recv timeout (0 disables timeout, default is 5 sec)", cmd);
+ printf("Usage: %s [-p <port>] [-a <IP address>] [-t <thread count>] [-k] [-q] [-T SEC]\nThe '-k' option turns on HTTP keepalive.\nThe '-q' option turns off some chatter on stdout.\nThe '-T' option sets socket recv timeout (0 disables timeout, default is 5 sec).\n", cmd);
}
static void sigint(int signum) {
diff --git a/src/settings.sml b/src/settings.sml
index cd2de8a9..10a4af48 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -883,7 +883,7 @@ fun addFile {Uri, LoadFromFilename} =
if path' = path then
()
else
- ErrorMsg.error ("Two different files requested for URI " ^ Uri)
+ ErrorMsg.error ("Two different files requested for URI " ^ Uri ^ " ( " ^ path' ^ " vs. " ^ path ^ ")")
| NONE =>
let
val inf = BinIO.openIn path