add options and tests

diff --git a/webserver.c b/webserver.c
index e0128e66aa243485633890fd4a6693d00876c33d..f10838ee7ffa9a04b5e84ae1ab258434b8d8c757 100644 (file)
--- a/webserver.c
+++ b/webserver.c
@@ -37,9 +37,11 @@ int usage (int ret)
 {
     FILE *fid = ret ? stderr : stdout;
     fprintf (fid, "usage: %s\n", progname);
+    fprintf (fid, " -c : charset name (%s)\n", charset);
     fprintf (fid, " -h : help message\n");
     fprintf (fid, " -p : port number (%d)\n", port);
     fprintf (fid, " -r : web root directory (%s)\n", root);
+    fprintf (fid, " -s : server name (%s)\n", servername);
     fprintf (fid, " -v : verbose level (%d)\n", verbose);
 
     return ret;
@@ -73,7 +75,15 @@ int main (int argc, char *argv[])
         }
         char c = arg[1];
         switch (c) {
-            case 'p':
+        case 'c':
+            arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
+            if (arg == NULL) {
+                VERBOSE (ERROR, PERROR ("%s: missing charset name\n", progname); usage (1));
+                return 1;
+            }
+            charset = arg;
+            break;
+        case 'p':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
                 VERBOSE (ERROR, PERROR ("%s: missing port number\n", progname); usage (1));
@@ -85,6 +95,14 @@ int main (int argc, char *argv[])
                 return 1;
             }
             break;
+        case 's':
+            arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
+            if (arg == NULL) {
+                VERBOSE (ERROR, PERROR ("%s: missing server name\n", progname); usage (1));
+                return 1;
+            }
+            servername = arg;
+            break;
         case 'r':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
@@ -183,10 +201,14 @@ int main (int argc, char *argv[])
 // test: webserver.exe -_ 2>&1 | awk '/usage:/ { rc=1 } END { exit (1-rc) }'
 // test: webserver.exe error 2>&1 | grep -q 'invalid option'
 // test: webserver.exe -v 2>&1 | grep -q 'missing verbose level'
+// test: webserver.exe -c 2>&1 | grep -q 'missing charset name'
 // test: webserver.exe -p 2>&1 | grep -q 'missing port number'
 // test: webserver.exe -p -1 2>&1 | grep -q 'incorrect port number'
+// test: webserver.exe -s 2>&1 | grep -q 'missing server name'
+// test: webserver.exe -r 2>&1 | grep -q 'missing directory name'
 // test: webserver.exe > test.log & pid=$!; sleep 1; kill -QUIT $pid; grep -q 'Listening socket on port 8080' test.log
 // test: webserver.exe -p 8000 > test.log & pid=$!; sleep 1; kill -ABRT $pid; grep -q 'Listening socket on port 8000' test.log
-// test: webserver.exe & pid=$!; sleep 1; kill -TERM $pid; ps aux | grep -q [w]ebserver.exe && kill -9 $pid || rc=1; test x$rc = x1
+// test: webserver.exe -c iso-8859-1 -r webroot -s localhost & pid=$!; sleep 1; curl http://localhost:8080/index.html -v > test; kill -TERM $pid; grep -q '<title>Test</title>' test
+
 
 /* vim: set ts=4 sw=4 et: */