httpd

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@237 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Example/httpd/httpd.c b/Example/httpd/httpd.c
index 33167e7f00d7607b78cd890cfd0f689dd0bfc39c..0c8852852acea435e97f7325aec873c590fc65b1 100644 (file)
--- a/Example/httpd/httpd.c
+++ b/Example/httpd/httpd.c
@@ -152,13 +152,44 @@ int main(int argc, char** argv) {
        if(f != NULL){
                struct stat s;
                stat(configfile, &s);
-               char* file = malloc(s.st_size + 1);
-               file[s.st_size] = 0;
-               fread(file, s.st_size, 1, f);
+               char* buf = malloc(s.st_size + 1);
+               buf[s.st_size] = 0;
+               fread(buf, s.st_size, 1, f);
 
                /* TODO: Parse the config file */
+               char* line = malloc(1);
+               line[0] = 0;
+               char* cbuf = malloc(2);
+               cbuf[1] = 0;
+               for(i = 0;; i++){
+                       if(buf[i] == '\n' || buf[i] == 0){
+                               if(line[0] != '#' && strcmp(line, "") != 0){
+                                       int j;
+                                       bool hasparam = false;
+                                       for(j = 0; line[j] != 0; j++){
+                                               if(line[j] == ' '){
+                                                       line[j] = 0;
+                                                       hasparam = true;
+                                                       break;
+                                               }
+                                       }
+                               }
+                               free(line);
+                               line = malloc(1);
+                               line[0] = 0;
+                               if(buf[i] == 0) break;
+                       }else if(buf[i] != '\r'){
+                               /* Rejecting \r is a good idea for the time when I add the Windows support. */
+                               cbuf[0] = buf[i];
+                               char* tmp = line;
+                               line = __W3_Concat(tmp, cbuf);
+                               free(tmp);
+                       }
+               }
+               free(cbuf);
+               free(line);
 
-               free(file);
+               free(buf);
                fclose(f);
        }else{
                free(badreq_header);

diff --git a/W3Version.h.m4 b/W3Version.h.m4
index 9b438e015a6d8445d293998a110f9326f386f0be..159dcd0ae747c9ae2e8c9b48e011f6a1cfe738d0 100644 (file)
--- a/W3Version.h.m4
+++ b/W3Version.h.m4
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#define LIBW3_VERSION "2.16B" \
+#define LIBW3_VERSION "2.16C" \
 SUFFIX
 
 ifdef(`HTTP_SUPPORT', `#define LIBW3_HTTP_SUPPORT', `')