WebSVN – Tewi – Diff – /trunk/Server/config.c

-/* $Id: config.c 189 2024-09-29 00:37:00Z nishi $ */
+/* $Id: config.c 212 2024-10-02 17:44:55Z nishi $ */
 #define SOURCE
 #include "tw_config.h"
 #include "tw_module.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(_MSC_VER)
 #include <winsock2.h>
 #endif
 #include <cm_string.h>
 #include <cm_log.h>
 	bool found = false;
 	bool pathstart = false;
 	bool perm = false;
 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)) {
-			pathstart = true;
 			int j;
+			pathstart = true;
 			for(j = 0; path[j] != 0 && e->dir[j] != 0; j++) {
 				if(path[j] != e->dir[j]) {
 					pathstart = false;
 					break;
+				}
+			}
+		}
-		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) {
 			found = true;
 			if(strcmp(e->name, "all") == 0) {
 				perm = e->type == TW_DIR_ALLOW;
 	tw_add_define("HAS_SSL");
 #endif
+}
 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;
+	cm_log("Config", "Reading %s", path);
-	FILE* f = fopen(path, "r");
+	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) {
-				ln++;
 				char* l = cm_trim(line);
+				ln++;
 				if(strlen(l) > 0 && l[0] != '#') {
 					char** r = cm_split(l, " \t");
 					int i;
 					if(ignore != -1 && ifbr >= ignore) {
 						if(cm_strcaseequ(r[0], "EndIf")) ifbr--;
 						} else {
 							if(r[1] == NULL) {
 								cm_log("Config", "Missing virtual host at line %d", ln);
 								stop = 1;
 							} else {
+								int i;
 								vhost = cm_strdup(r[1]);
 								current = &config.vhosts[config.vhost_count++];
 								current->dir_count = 0;
 								current->mime_count = 0;
 								current->icon_count = 0;
 								current->index_count = 0;
 								current->readme_count = 0;
 								current->hideport = -1;
-								int i;
 								current->name = cm_strdup(vhost);
 								current->port = -1;
 								for(i = 0; vhost[i] != 0; i++) {
 									if(vhost[i] == ':') {
 										current->name[i] = 0;
 #ifndef NO_SSL
 						  || cm_strcaseequ(r[0], "ListenSSL")
 #endif
 					) {
 						for(i = 1; r[i] != NULL; i++) {
+#ifdef _MSC_VER
+							uint32_t port = atoi(r[i]);
+#else
 							uint64_t port = atoi(r[i]);
-							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);
+#endif
 							int j;
+							cm_log("Config", "Going to listen at port %d%s", (int)port, cm_strcaseequ(r[0], "ListenSSL") ? " with SSL" : "");
+#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++)
+								;
 							config.ports[j] = port;
+						}
 					} else if(cm_strcaseequ(r[0], "HidePort")) {
 						ifbr--;
 					} else if(cm_strcaseequ(r[0], "BeginIf") || cm_strcaseequ(r[0], "BeginIfNot")) {
 						if(r[1] == NULL) {
 							cm_log("Config", "Missing condition type at line %d", ln);
 						} else {
-							ifbr++;
 							bool ign = false;
+							ifbr++;
 							if(cm_strcaseequ(r[1], "False")) {
 								ign = true;
 							} else if(cm_strcaseequ(r[1], "True")) {
 							} else if(cm_strcaseequ(r[1], "Defined")) {
 								if(r[2] == NULL) {
+						}
 					} else {
 						stop = 1;
 						if(r[0] != NULL) {
 							int argc;
-							for(argc = 0; r[argc] != NULL; argc++)
-								;
-							stop = 0;
 							int i;
 							bool called = false;
 							struct tw_tool tools;
+							for(argc = 0; r[argc] != NULL; argc++)
+								;
+							stop = 0;
 							tw_init_tools(&tools);
 							for(i = 0; i < config.module_count; i++) {
 								tw_mod_config_t mod_config = (tw_mod_config_t)tw_module_symbol(config.modules[i], "mod_config");
 								int resp;
 								if(mod_config != NULL && (resp = mod_config(&tools, r, argc)) == TW_CONFIG_PARSED) {

Subversion Repositories Tewi

(root)/trunk/Server/config.c – Rev 189 → 212