From 1996305eb1a813db6d8cccfe12caaec5c185ebe1 Mon Sep 17 00:00:00 2001
From: "roberto@debian32" <roberto@debian32>
Date: Sun, 28 Aug 2011 07:55:54 +0200
Subject: [PATCH] allows multiple --ini options

---
 plugins/python/python_plugin.c |   8 +--
 uwsgi.c                        | 108 ++++++++++++++++++---------------
 uwsgi.h                        |   2 +-
 3 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/plugins/python/python_plugin.c b/plugins/python/python_plugin.c
index 3b95bcc2..e2059ec4 100644
--- a/plugins/python/python_plugin.c
+++ b/plugins/python/python_plugin.c
@@ -793,12 +793,12 @@ int uwsgi_python_manage_options(int i, char *optarg) {
 
 #ifdef UWSGI_INI
 	case LONG_ARGS_INI_PASTE:
-		uwsgi.ini = optarg;
-		if (uwsgi.ini[0] != '/') {
-			up.paste = uwsgi_concat4("config:", uwsgi.cwd, "/", uwsgi.ini);
+		uwsgi_string_new_list(&uwsgi.ini,optarg);
+		if (optarg[0] != '/') {
+			up.paste = uwsgi_concat4("config:", uwsgi.cwd, "/", optarg);
 		}
 		else {
-			up.paste = uwsgi_concat2("config:", uwsgi.ini);
+			up.paste = uwsgi_concat2("config:", optarg);
 		}
 		return 1;
 #endif
diff --git a/uwsgi.c b/uwsgi.c
index 964ca131..05e1118d 100644
--- a/uwsgi.c
+++ b/uwsgi.c
@@ -1002,72 +1002,80 @@ int main(int argc, char *argv[], char *envp[]) {
 		uwsgi.option_index = -1;
 	}
 
+#ifdef UWSGI_DEBUG
+	uwsgi_log("optind:%d argc:%d\n", optind,argc);
+#endif
+
 	if (optind < argc) {
-		char *lazy = argv[optind];
-		if (lazy[0] != '[') {
-			if (0) {
-			}
+		for(i=optind;i<argc;i++) {
+			char *lazy = argv[i];
+			if (lazy[0] != '[') {
+				if (0) {
+				}
 
 #ifdef UWSGI_XML
-			else if (!strcmp(lazy + strlen(lazy) - 4, ".xml")) {
-				uwsgi.xml_config = lazy;
-			}
+				else if (!strcmp(lazy + strlen(lazy) - 4, ".xml")) {
+					uwsgi.xml_config = lazy;
+				}
 #endif
 #ifdef UWSGI_INI
-			else if (!strcmp(lazy + strlen(lazy) - 4, ".ini")) {
-				uwsgi.ini = lazy;
-			}
+				else if (!strcmp(lazy + strlen(lazy) - 4, ".ini")) {
+					uwsgi_string_new_list(&uwsgi.ini, lazy);
+				}
 #endif
 #ifdef UWSGI_YAML
-			else if (!strcmp(lazy + strlen(lazy) - 4, ".yml")) {
-				uwsgi.yaml = lazy;
-			}
-			else if (!strcmp(lazy + strlen(lazy) - 5, ".yaml")) {
-				uwsgi.yaml = lazy;
-			}
+				else if (!strcmp(lazy + strlen(lazy) - 4, ".yml")) {
+					uwsgi.yaml = lazy;
+				}
+				else if (!strcmp(lazy + strlen(lazy) - 5, ".yaml")) {
+					uwsgi.yaml = lazy;
+				}
 #endif
 #ifdef UWSGI_JSON
-			else if (!strcmp(lazy + strlen(lazy) - 3, ".js")) {
-				uwsgi.json = lazy;
-			}
+				else if (!strcmp(lazy + strlen(lazy) - 3, ".js")) {
+					uwsgi.json = lazy;
+				}
 #endif
 #ifdef UWSGI_SQLITE3
-			else if (!strcmp(lazy + strlen(lazy) - 3, ".db")) {
-				uwsgi.sqlite3 = lazy;
-			}
-			else if (!strcmp(lazy + strlen(lazy) - 7, ".sqlite")) {
-				uwsgi.sqlite3 = lazy;
-			}
-			else if (!strcmp(lazy + strlen(lazy) - 8, ".sqlite3")) {
-				uwsgi.sqlite3 = lazy;
-			}
-#endif
-			// manage magic mountpoint
-			else if ((lazy[0] == '/' || strchr(lazy, '|')) && strchr(lazy, '=')) {
-			}
-			else {
-				int magic = 0;
-				for (i = 0; i < uwsgi.gp_cnt; i++) {
-					if (uwsgi.gp[i]->magic) {
-						if (uwsgi.gp[i]->magic(NULL, lazy)) {
-							magic = 1;
-							break;
-						}
-					}
+				else if (!strcmp(lazy + strlen(lazy) - 3, ".db")) {
+					uwsgi.sqlite3 = lazy;
 				}
-				if (!magic) {
-					for (i = 0; i < 0xFF; i++) {
-						if (uwsgi.p[i]->magic) {
-							if (uwsgi.p[i]->magic(NULL, lazy)) {
+				else if (!strcmp(lazy + strlen(lazy) - 7, ".sqlite")) {
+					uwsgi.sqlite3 = lazy;
+				}
+				else if (!strcmp(lazy + strlen(lazy) - 8, ".sqlite3")) {
+					uwsgi.sqlite3 = lazy;
+				}
+#endif
+				// manage magic mountpoint
+				else if ((lazy[0] == '/' || strchr(lazy, '|')) && strchr(lazy, '=')) {
+				}
+				else {
+					int magic = 0;
+					for (i = 0; i < uwsgi.gp_cnt; i++) {
+						if (uwsgi.gp[i]->magic) {
+							if (uwsgi.gp[i]->magic(NULL, lazy)) {
 								magic = 1;
 								break;
 							}
 						}
 					}
+					if (!magic) {
+						for (i = 0; i < 0xFF; i++) {
+							if (uwsgi.p[i]->magic) {
+								if (uwsgi.p[i]->magic(NULL, lazy)) {
+									magic = 1;
+									break;
+								}
+							}
+						}
+					}
 				}
 			}
 		}
 	}
+
+	struct uwsgi_string_list *config_file;
 	
 #ifdef UWSGI_XML
 	if (uwsgi.xml_config != NULL) {
@@ -1078,8 +1086,12 @@ int main(int argc, char *argv[], char *envp[]) {
 #endif
 #ifdef UWSGI_INI
 	if (uwsgi.ini != NULL) {
-		config_magic_table_fill(uwsgi.ini, uwsgi.magic_table);
-		uwsgi_ini_config(uwsgi.ini, uwsgi.magic_table);
+		config_file = uwsgi.ini;
+		while(config_file) {
+			config_magic_table_fill(config_file->value, uwsgi.magic_table);
+			uwsgi_ini_config(config_file->value, uwsgi.magic_table);
+			config_file = config_file->next;
+		}
 	}
 #endif
 #ifdef UWSGI_YAML
@@ -3099,7 +3111,7 @@ static int manage_base_opt(int i, char *optarg) {
 #endif
 #ifdef UWSGI_INI
 	case LONG_ARGS_INI:
-		uwsgi.ini = optarg;
+		uwsgi_string_new_list(&uwsgi.ini, optarg);
 		return 1;
 #endif
 	case LONG_ARGS_SOCKET_PROTOCOL:
diff --git a/uwsgi.h b/uwsgi.h
index c9cea935..2935402e 100644
--- a/uwsgi.h
+++ b/uwsgi.h
@@ -1172,7 +1172,7 @@ struct uwsgi_server {
 #endif
 
 #ifdef UWSGI_INI
-	char *ini;
+	struct uwsgi_string_list *ini;
 #endif
 
 #ifdef UWSGI_SQLITE3