Add config_open_string function

This allows opening ini config data from a string.  Before, it was only
possible to load config from a file.

libobs/util/config-file.c

@@ -163,63 +163,68 @@ static void config_parse_section(struct config_section *section,
 	}
 }
 
-static int config_parse(struct darray *sections, const char *file,
-		bool always_open)
+static void parse_config_data(struct darray *sections, struct lexer *lex)
 {
-	char *file_data;
-	struct lexer lex;
-	struct base_token token;
 	struct strref section_name;
-	FILE *f;
-
-	f = os_fopen(file, "rb");
-	if (always_open && !f)
-		f = os_fopen(file, "w+");
-	if (!f)
-		return CONFIG_FILENOTFOUND;
-
-	os_fread_utf8(f, &file_data);
-	fclose(f);
-
-	if (!file_data)
-		return CONFIG_SUCCESS;
-
-	lexer_init(&lex);
-	lexer_start_move(&lex, file_data);
+	struct base_token token;
 
 	base_token_clear(&token);
 
-	while (lexer_getbasetoken(&lex, &token, PARSE_WHITESPACE)) {
+	while (lexer_getbasetoken(lex, &token, PARSE_WHITESPACE)) {
 		struct config_section *section;
 
 		while (token.type == BASETOKEN_WHITESPACE) {
-			if (!lexer_getbasetoken(&lex, &token, PARSE_WHITESPACE))
-				goto complete;
+			if (!lexer_getbasetoken(lex, &token, PARSE_WHITESPACE))
+				return;
 		}
 
 		if (*token.text.array != '[') {
 			while (!is_newline(*token.text.array)) {
-				if (!lexer_getbasetoken(&lex, &token,
+				if (!lexer_getbasetoken(lex, &token,
 							PARSE_WHITESPACE))
-					goto complete;
+					return;
 			}
 
 			continue;
 		}
 
 		strref_clear(&section_name);
-		config_parse_string(&lex, &section_name, ']');
+		config_parse_string(lex, &section_name, ']');
 		if (!section_name.len)
-			break;
+			return;
 
 		section = darray_push_back_new(sizeof(struct config_section),
 				sections);
 		section->name = bstrdup_n(section_name.array,
 				section_name.len);
-		config_parse_section(section, &lex);
+		config_parse_section(section, lex);
 	}
+}
+
+static int config_parse_file(struct darray *sections, const char *file,
+		bool always_open)
+{
+	char *file_data;
+	struct lexer lex;
+	FILE *f;
+
+	f = os_fopen(file, "rb");
+	if (always_open && !f)
+		f = os_fopen(file, "w+");
+	if (!f)
+		return CONFIG_FILENOTFOUND;
+
+	os_fread_utf8(f, &file_data);
+	fclose(f);
+
+	if (!file_data)
+		return CONFIG_SUCCESS;
+
+	lexer_init(&lex);
+	lexer_start_move(&lex, file_data);
+
+	parse_config_data(sections, &lex);
 
-complete:
 	lexer_free(&lex);
 	return CONFIG_SUCCESS;
 }
@@ -239,7 +244,7 @@ int config_open(config_t **config, const char *file,
 
 	(*config)->file = bstrdup(file);
 
-	errorcode = config_parse(&(*config)->sections, file, always_open);
+	errorcode = config_parse_file(&(*config)->sections, file, always_open);
 
 	if (errorcode != CONFIG_SUCCESS) {
 		config_close(*config);
@@ -249,12 +254,33 @@ int config_open(config_t **config, const char *file,
 	return errorcode;
 }
 
+int config_open_string(config_t **config, const char *str)
+{
+	struct lexer lex;
+
+	if (!config)
+		return CONFIG_ERROR;
+
+	*config = bzalloc(sizeof(struct config_data));
+	if (!*config)
+		return CONFIG_ERROR;
+
+	(*config)->file = NULL;
+
+	lexer_init(&lex);
+	lexer_start(&lex, str);
+	parse_config_data(&(*config)->sections, &lex);
+	lexer_free(&lex);
+
+	return CONFIG_SUCCESS;
+}
+
 int config_open_defaults(config_t *config, const char *file)
 {
 	if (!config)
 		return CONFIG_ERROR;
 
-	return config_parse(&config->defaults, file, false);
+	return config_parse_file(&config->defaults, file, false);
 }
 
 int config_save(config_t *config)
@@ -265,6 +291,8 @@ int config_save(config_t *config)
 
 	if (!config)
 		return CONFIG_ERROR;
+	if (!config->file)
+		return CONFIG_ERROR;
 
 	dstr_init(&str);
 

libobs/util/config-file.h

@@ -44,6 +44,7 @@ enum config_open_type {
 EXPORT config_t *config_create(const char *file);
 EXPORT int config_open(config_t **config, const char *file,
 		enum config_open_type open_type);
+EXPORT int config_open_string(config_t **config, const char *str);
 EXPORT int config_save(config_t *config);
 EXPORT void config_close(config_t *config);