Changeset 257 in Main for trunk/Server

Timestamp:

Oct 4, 2024, 2:34:27 PM (6 weeks ago)

Author:

Nishi

Message:

[release 2.04] can read mime.types from apache

Location:

trunk/Server

Files:

• config.c (modified) (2 diffs)
• gui.rc (modified) (1 diff)
• install.nsi (modified) (1 diff)
• main.c (modified) (2 diffs)
• server.c (modified) (1 diff)
• tw_config.h (modified) (2 diffs)
• tw_version.h (modified) (1 diff)

trunk/Server/config.c

@@ -10 +10 @@
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #if !defined(_MSC_VER) && !defined(__BORLANDC__)
@@ -405 +406 @@
                                                         e->mime = cm_strdup(r[2]);
                                                 }
+                                        } else if(cm_strcaseequ(r[0], "MIMEFile")) {
+                                                if(r[1] == NULL) {
+                                                        cm_log("Config", "Missing path at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        FILE* mimefile = fopen(r[1], "r");
+                                                        if(mimefile == NULL) {
+                                                                cm_log("Config", "Could not load the file at line %d", ln);
+                                                                stop = 1;
+                                                        } else {
+                                                                char* line = malloc(1);
+                                                                int i;
+                                                                struct stat st;
+                                                                char* buf;
+                                                                int incr = 0;
+                                                                stat(r[1], &st);
+
+                                                                buf = malloc(st.st_size + 1);
+                                                                fread(buf, st.st_size, 1, mimefile);
+
+                                                                for(i = 0;; i++) {
+                                                                        if(buf[i] == '\n' || buf[i] == 0) {
+                                                                                char oldc = buf[i];
+                                                                                char* line;
+                                                                                buf[i] = 0;
+
+                                                                                line = buf + incr;
+
+                                                                                if(strlen(line) > 0 && line[0] != '#') {
+                                                                                        int j;
+                                                                                        for(j = 0; line[j] != 0; j++) {
+                                                                                                if(line[j] == ' ' || line[j] == '\t') {
+                                                                                                        line[j] = 0;
+                                                                                                        j++;
+                                                                                                        for(; line[j] != 0; j++) {
+                                                                                                                if(line[j] != ' ' && line[j] != '\t') {
+                                                                                                                        char* name = line;
+                                                                                                                        char* mimes = line + j;
+                                                                                                                        int k = 0;
+                                                                                                                        int incr2 = 0;
+                                                                                                                        for(k = 0;; k++) {
+                                                                                                                                if(mimes[k] == ' ' || mimes[k] == 0) {
+                                                                                                                                        char oldc2 = mimes[k];
+                                                                                                                                        struct tw_mime_entry* e;
+                                                                                                                                        mimes[k] = 0;
+
+                                                                                                                                        e = &current->mimes[current->mime_count++];
+                                                                                                                                        e->ext = cm_strcat(".", mimes + incr2);
+                                                                                                                                        e->mime = cm_strdup(name);
+                                                                                                                                        if(current->mime_count == MAX_MIME) {
+                                                                                                                                                cm_log("Config", "Too many MIME types, cannot handle");
+                                                                                                                                                stop = 1;
+                                                                                                                                                break;
+                                                                                                                                        }
+
+                                                                                                                                        incr2 = k + 1;
+                                                                                                                                        if(oldc2 == 0) break;
+                                                                                                                                }
+                                                                                                                        }
+                                                                                                                        break;
+                                                                                                                }
+                                                                                                        }
+                                                                                                        break;
+                                                                                                }
+                                                                                                if(stop) break;
+                                                                                        }
+                                                                                }
+
+                                                                                incr = i + 1;
+                                                                                if(oldc == 0) break;
+                                                                        }
+                                                                }
+
+                                                                free(buf);
+
+                                                                fclose(mimefile);
+                                                        }
+                                                }
                                         } else if(cm_strcaseequ(r[0], "Icon")) {
                                                 if(r[1] == NULL) {

trunk/Server/gui.rc

@@ -14 +14 @@
         LTEXT TW_VERSION_TEXT, GUI_TEWI_NAME, 42, 5, 192, 50
         LTEXT "Original by Nishi <nishi@nishi.boats>", GUI_TEWI_ORIGINAL, 42, 5 + 8, 192, 50
+        LTEXT "Website: http://nishi.boats/tewi", GUI_TEWI_ORIGINAL, 42, 5 + 8 * 2, 192, 50
         DEFPUSHBUTTON "&OK", IDOK, 75, 35, 50, 10
 }

trunk/Server/install.nsi

@@ -54 +54 @@
         File /oname=pbtewi.gif "pbtewi.gif"
         !cd ..
+        !cd Icons
         SetOutPath "$INSTDIR\www\icons"
-        !cd Icons
         File "*.png"
         !cd ..
         !cd Server
         SetOverWrite on
+        !cd ..
+        SetOutPath "$INSTDIR"
+        File "mime.types"
+        !cd Server
 
         CreateDirectory "$SMPROGRAMS\Tewi HTTPd"

trunk/Server/main.c

@@ -87 +87 @@
 int startup(int argc, char** argv);
 
-#if defined(__MINGW32__) || defined(_MSC_VER)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)
 char* get_registry(const char* main, const char* sub) {
         DWORD bufsize = 512;
@@ -711 +711 @@
         int i;
         char* r;
-#if defined(__MINGW32__) || defined(_MSC_VER)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)
         char* confpath = cm_strdup(PREFIX "/etc/tewi.conf");
         char* regpath = get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir");

trunk/Server/server.c

@@ -498 +498 @@
         struct sockaddr* sa = (struct sockaddr*)&addr;
         getnameinfo(sa, sizeof(addr), address, 512, NULL, 0, NI_NUMERICHOST);
-#endif
-        addrstr = inet_ntoa(addr.sin_addr);
-        strcpy(address, addrstr);
-        address[strlen(addrstr)] = 0;
+#else
+                addrstr = inet_ntoa(addr.sin_addr);
+                strcpy(address, addrstr);
+                address[strlen(addrstr)] = 0;
+#endif
 #ifdef FREE_PTR
         free(ptr);

trunk/Server/tw_config.h

@@ -42 +42 @@
 #define MAX_MODULES 1024
 #define MAX_DIRS 1024
-#define MAX_MIME 1024
+#define MAX_MIME 4096
 #define MAX_ICON 1024
 #define MAX_INDEX 1024
@@ -85 +85 @@
         struct tw_dir_entry dirs[MAX_DIRS];
         int dir_count;
-        struct tw_mime_entry mimes[MAX_DIRS];
+        struct tw_mime_entry mimes[MAX_MIME];
         int mime_count;
-        struct tw_icon_entry icons[MAX_DIRS];
+        struct tw_icon_entry icons[MAX_ICON];
         int icon_count;
         char* indexes[MAX_INDEX];

trunk/Server/tw_version.h

@@ -8 +8 @@
 #endif
 
-#define TW_VERSION "2.03E\0"
-#define TW_VERSION_TEXT "Tewi HTTPd version 2.03E"
+#define TW_VERSION "2.04\0"
+#define TW_VERSION_TEXT "Tewi HTTPd version 2.04"
 
 const char* tw_get_version(void);