X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=e927abdbdfa9bb2ca9f9898caabd963ab8d5680a;hp=4a444433c96e08faeacf3c4c79078b134fbba0b3;hb=7e74e00d167da659ba6c3db3e8822008d27c081b;hpb=83263b74460656ba557fd9bb84dc27258549e9cd

diff --git a/src/conf.c b/src/conf.c
index 4a444433..e927abdb 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.69 2003/07/24 12:08:15 guus Exp $
+    $Id: conf.c,v 1.9.4.74 2003/08/08 14:59:27 guus Exp $
 */
 
 #include "system.h"
@@ -326,6 +326,7 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
 	char *buffer, *line;
 	char *variable, *value;
 	int lineno = 0;
+	int len;
 	bool ignore = false;
 	config_t *cfg;
 	size_t bufsize;
@@ -358,37 +359,44 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
 
 		lineno++;
 
-		variable = strtok(line, "\t =");
+		if(!*line || *line == '#')
+			continue;
 
-		if(!variable)
-			continue;			/* no tokens on this line */
-
-		if(variable[0] == '#')
-			continue;			/* comment: ignore */
-
-		if(!strcmp(variable, "-----BEGIN"))
+		if(ignore) {
+			if(!strncmp(line, "-----END", 8))
+				ignore = false;
+			continue;
+		}
+		
+		if(!strncmp(line, "-----BEGIN", 10)) {
 			ignore = true;
+			continue;
+		}
 
-		if(!ignore) {
-			value = strtok(NULL, "\t\n\r =");
-
-			if(!value || value[0] == '#') {
-				logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
-					   variable, lineno, fname);
-				break;
-			}
+		variable = value = line;
 
-			cfg = new_config();
-			cfg->variable = xstrdup(variable);
-			cfg->value = xstrdup(value);
-			cfg->file = xstrdup(fname);
-			cfg->line = lineno;
+		len = strcspn(value, "\t =");
+		value += len;
+		value += strspn(value, "\t ");
+		if(*value == '=') {
+			value++;
+			value += strspn(value, "\t ");
+		}
+		variable[len] = '\0';
 
-			config_add(config_tree, cfg);
+		if(!*value) {
+			logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
+				   variable, lineno, fname);
+			break;
 		}
 
-		if(!strcmp(variable, "-----END"))
-			ignore = false;
+		cfg = new_config();
+		cfg->variable = xstrdup(variable);
+		cfg->value = xstrdup(value);
+		cfg->file = xstrdup(fname);
+		cfg->line = lineno;
+
+		config_add(config_tree, cfg);
 	}
 
 	free(buffer);
@@ -537,7 +545,11 @@ FILE *ask_and_safe_open(const char *filename, const char *what, bool safe, const
 			fn = xstrdup(filename);
 	}
 
-	if(!strchr(fn, '/') || fn[0] != '/') {
+#ifdef HAVE_MINGW
+	if(fn[0] != '\\' && fn[0] != '/' && !strchr(fn, ':')) {
+#else
+	if(fn[0] != '/') {
+#endif
 		/* The directory is a relative path or a filename. */
 		char *p;