X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=webserver.c;h=555afbf704685f985435d073231ae9d3cdba396d;hb=refs%2Fheads%2Fmaster;hp=770d75dd5d68e5680f827ecfa918bdd65ef520df;hpb=f37eeed8209bd1c12966ff59e80e21776289d13c;p=webserver.git

diff --git a/webserver.c b/webserver.c
index 770d75d..555afbf 100644
--- a/webserver.c
+++ b/webserver.c
@@ -6,9 +6,11 @@
 #include <dirent.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "debug.h"
+#include "file.h"
 #include "http.h"
 #include "server.h"
 
@@ -18,6 +20,7 @@
 
 #define BUFFER_SIZE 4096
 #define ROOT_DIR "webroot"
+#define TEMP_DIR "tmp"
 #define SERVER_NAME "localhost"
 #define CHARSET "iso-8859-1"
 
@@ -28,6 +31,7 @@
 char *progname = NULL;
 int port = 8080;
 char *root = ROOT_DIR;
+char *temp = TEMP_DIR;
 char *servername = SERVER_NAME;
 char *charset = CHARSET;
 
@@ -42,6 +46,7 @@ int usage (int ret)
     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, " -t : temporay directory (%s)\n", temp);
     fprintf (fid, " -v : verbose level (%d)\n", verbose);
 
     return ret;
@@ -95,6 +100,14 @@ int main (int argc, char *argv[])
                 return 1;
             }
             break;
+        case 'r':
+            arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
+            if (arg == NULL) {
+                VERBOSE (ERROR, PERROR ("%s: missing directory name\n", progname); usage (1));
+                return 1;
+            }
+            root = arg;
+            break;
         case 's':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
@@ -103,13 +116,13 @@ int main (int argc, char *argv[])
             }
             servername = arg;
             break;
-        case 'r':
+        case 't':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
             if (arg == NULL) {
                 VERBOSE (ERROR, PERROR ("%s: missing directory name\n", progname); usage (1));
                 return 1;
             }
-            root = arg;
+            temp = arg;
             break;
         case 'v':
             arg = (arg[2]) ? arg + 2 : (--argc > 0) ? *(++argv) : NULL;
@@ -125,17 +138,37 @@ int main (int argc, char *argv[])
         }
     }
 
+    /* init seed */
+    srand (time (NULL));
+
     /* check root directory */
     VERBOSE (DEBUG, PRINT ("Check web root\n"));
-    DIR *pdir = opendir (root);
-    if (pdir == NULL) {
+    DIR *prootdir = opendir (root);
+    if (prootdir == NULL) {
         VERBOSE (ERROR, PERROR ("Can't read directory (%s)\n", root));
         return 1;
     }
-    closedir (pdir);
+    closedir (prootdir);
+
+    /* check temp directory */
+    VERBOSE (DEBUG, PRINT ("Check temp dirweb root\n"));
+    DIR *ptempdir = opendir (temp);
+    if (ptempdir == NULL) {
+        VERBOSE (ERROR, PERROR ("Can't read directory (%s)\n", temp));
+        return 1;
+    }
+    char *ntemp = tempname (temp, NULL);
+    FILE *ftemp = fopen (ntemp, "w");
+    if (ftemp == NULL) {
+        VERBOSE (ERROR, PERROR ("Can't write temporary file (%s)\n", ntemp));
+        return 1;
+    }
+    fclose (ftemp);
+    unlink (ntemp);
+    free (ntemp);
 
     /* configuration */
-    conf_t conf = {root, servername, charset};
+    conf_t conf = {root, temp, servername, charset};
 
     /* init network stack */
     VERBOSE (DEBUG, PRINT ("Initializing socket\n"));
@@ -206,11 +239,12 @@ int main (int argc, char *argv[])
 // 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 -c iso-8859-1 -r webroot -s localhost >&/dev/null & pid=$!; sleep 1; curl http://localhost:8080/index.html > test; kill -TERM $pid; grep -q '<title>Test</title>' test
-// test: webserver.exe -v 3 -p 8001 >&/dev/null & pid=$!; sleep 1; curl http://localhost:8001/index.html > test; kill -TERM $pid
-// test: webserver.exe -v 3 -p 8002 >&/dev/null & pid=$!; sleep 1; curl http://localhost:8002/not_found.html > test; kill -TERM $pid; grep -q '404' test
-
+// test: webserver.exe >& test.log & pid=$!; sleep 1; kill -ABRT $pid; sleep 1; grep -q 'Listening socket on port 8080' test.log
+// test: webserver.exe -p 8000 >& test.log & pid=$!; sleep 1; kill -TERM $pid; sleep 1; grep -q 'Listening socket on port 8000' test.log
+// test: webserver.exe -p 8001 -c iso-8859-1 -r webroot -s localhost >&/dev/null & pid=$!; sleep 1; curl http://localhost:8001/index.html > test.log; kill -TERM $pid; sleep 1; grep -q '<title>Test</title>' test.log
+// test: webserver.exe -v 3 -p 8002 >&/dev/null & pid=$!; sleep 1; curl -v http://localhost:8002/index.html >& test.log; kill -TERM $pid; sleep 1; grep -q 200 test.log
+// test: webserver.exe -v 3 -p 8003 >&/dev/null & pid=$!; sleep 1; curl -v http://localhost:8003/not_found.html >& test.log; kill -TERM $pid; sleep 1; grep -q 404 test.log
+// test: webserver.exe -v 3 -p 8004 >&/dev/null & pid=$!; sleep 1; curl -v -I http://localhost:8004/index.html >& test.log; kill -TERM $pid; sleep 1; grep -q Content-Length test.log; test $? -eq 1
+// test: webserver.exe -v 3 -p 8005 >&/dev/null & pid=$!; sleep 1; curl -v -d '' http://localhost:8005/index.html >& test.log; kill -TERM $pid; sleep 1; grep -q '<title>Test</title>' test.log
 
 /* vim: set ts=4 sw=4 et: */