Changeset 212 in Main for trunk/Server/config.c

Timestamp:

Oct 3, 2024, 2:44:55 AM (6 weeks ago)

Author:

Nishi

Message:

compiles on vc6

File:

• trunk/Server/config.c (modified) (9 diffs)

trunk/Server/config.c

@@ -10 +10 @@
 #include <stdlib.h>
 #include <string.h>
+
+#ifndef _MSC_VER
 #include <unistd.h>
-
-#ifdef __MINGW32__
+#endif
+
+#if defined(__MINGW32__) || defined(_MSC_VER)
 #include <winsock2.h>
 #endif
@@ -38 +41 @@
 again:
         for(i = 0; i < vhost->dir_count; i++) {
+                char* noslash;
                 struct tw_dir_entry* e = &vhost->dirs[i];
                 pathstart = false;
                 if(strlen(path) >= strlen(e->dir)) {
+                        int j;
                         pathstart = true;
-                        int j;
                         for(j = 0; path[j] != 0 && e->dir[j] != 0; j++) {
                                 if(path[j] != e->dir[j]) {
@@ -50 +54 @@
                         }
                 }
-                char* noslash = cm_strdup(e->dir);
+                noslash = cm_strdup(e->dir);
                 noslash[strlen(noslash) - 1] = 0;
                 if(strcmp(e->dir, path) == 0 || strcmp(noslash, path) == 0 || pathstart) {
@@ -120 +124 @@
 
 int tw_config_read(const char* path) {
-        cm_log("Config", "Reading %s", path);
         char cbuf[2];
-        cbuf[1] = 0;
         int ln = 0;
         int ifbr = 0;
         int ignore = -1;
-        FILE* f = fopen(path, "r");
+        FILE* f;
+        cm_log("Config", "Reading %s", path);
+        f = fopen(path, "r");
+        cbuf[1] = 0;
         if(f != NULL) {
                 char* line = malloc(1);
-                line[0] = 0;
                 int stop = 0;
                 struct tw_config_entry* current = &config.root;
                 char* vhost = NULL;
                 char* dir = NULL;
+                line[0] = 0;
                 while(stop == 0) {
                         int c = fread(cbuf, 1, 1, f);
                         if(cbuf[0] == '\n' || c <= 0) {
+                                char* l = cm_trim(line);
                                 ln++;
-                                char* l = cm_trim(line);
                                 if(strlen(l) > 0 && l[0] != '#') {
                                         char** r = cm_split(l, " \t");
@@ -227 +232 @@
                                                                 stop = 1;
                                                         } else {
+                                                                int i;
                                                                 vhost = cm_strdup(r[1]);
                                                                 current = &config.vhosts[config.vhost_count++];
@@ -235 +241 @@
                                                                 current->readme_count = 0;
                                                                 current->hideport = -1;
-                                                                int i;
                                                                 current->name = cm_strdup(vhost);
                                                                 current->port = -1;
@@ -262 +267 @@
                                         ) {
                                                 for(i = 1; r[i] != NULL; i++) {
+#ifdef _MSC_VER
+                                                        uint32_t port = atoi(r[i]);
+#else
                                                         uint64_t port = atoi(r[i]);
+#endif
+                                                        int j;
                                                         cm_log("Config", "Going to listen at port %d%s", (int)port, cm_strcaseequ(r[0], "ListenSSL") ? " with SSL" : "");
-                                                        if(cm_strcaseequ(r[0], "ListenSSL")) port |= (1ULL << 32);
-                                                        int j;
+#ifdef _MSC_VER
+                                                        if(cm_strcaseequ(r[0], "ListenSSL")) port |= (1UL << 31);
+#else
+                                                        if(cm_strcaseequ(r[0], "ListenSSL")) port |= (1ULL << 31);
+#endif
                                                         for(j = 0; config.ports[j] != -1; j++)
                                                                 ;
@@ -319 +332 @@
                                                         cm_log("Config", "Missing condition type at line %d", ln);
                                                 } else {
+                                                        bool ign = false;
                                                         ifbr++;
-                                                        bool ign = false;
                                                         if(cm_strcaseequ(r[1], "False")) {
                                                                 ign = true;
@@ -429 +442 @@
                                                 if(r[0] != NULL) {
                                                         int argc;
+                                                        int i;
+                                                        bool called = false;
+                                                        struct tw_tool tools;
                                                         for(argc = 0; r[argc] != NULL; argc++)
                                                                 ;
                                                         stop = 0;
-                                                        int i;
-                                                        bool called = false;
-                                                        struct tw_tool tools;
                                                         tw_init_tools(&tools);
                                                         for(i = 0; i < config.module_count; i++) {