summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-04-23 19:13:41 +0000
committerrubidium <rubidium@openttd.org>2009-04-23 19:13:41 +0000
commit208234a7a04027a2cff511447bc1f0ea2627741b (patch)
tree364d6487e2961c1714dfc111253d56bad04fb09f /src
parente2a7732151bff77aacdfc0f1a7f231d4be6d5c95 (diff)
downloadopenttd-208234a7a04027a2cff511447bc1f0ea2627741b.tar.xz
(svn r16128) -Change: allow loading (and storing) NULL values for STRQ in openttd.cfg.
Diffstat (limited to 'src')
-rw-r--r--src/ini.cpp8
-rw-r--r--src/settings.cpp13
2 files changed, 10 insertions, 11 deletions
diff --git a/src/ini.cpp b/src/ini.cpp
index 723b4d00b..e631ca769 100644
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -237,7 +237,7 @@ void IniFile::LoadFromDisk(const char *filename)
/* find start of parameter */
while (*t == '=' || *t == ' ' || *t == '\t') t++;
-
+ bool quoted = (*t == '\"');
/* remove starting quotation marks */
if (*t == '\"') t++;
/* remove ending quotation marks */
@@ -245,7 +245,8 @@ void IniFile::LoadFromDisk(const char *filename)
if (e > t && e[-1] == '\"') e--;
*e = '\0';
- item->value = strndup(t, e - t);
+ /* If the value was not quoted and empty, it must be NULL */
+ item->value = (!quoted && e == t) ? NULL : strndup(t, e - t);
} else {
/* it's an orphan item */
ShowInfoF("ini: '%s' outside of group", buffer);
@@ -279,7 +280,6 @@ bool IniFile::SaveToDisk(const char *filename)
if (group->comment) fputs(group->comment, f);
fprintf(f, "[%s]\n", group->name);
for (const IniItem *item = group->item; item != NULL; item = item->next) {
- assert(item->value != NULL);
if (item->comment != NULL) fputs(item->comment, f);
/* protect item->name with quotes if needed */
@@ -290,7 +290,7 @@ bool IniFile::SaveToDisk(const char *filename)
fprintf(f, "%s", item->name);
}
- fprintf(f, " = %s\n", item->value);
+ fprintf(f, " = %s\n", item->value == NULL ? "" : item->value);
}
}
if (this->comment) fputs(this->comment, f);
diff --git a/src/settings.cpp b/src/settings.cpp
index 2b020a679..a37eadf65 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -293,8 +293,9 @@ static void make_manyofmany(char *buf, const char *last, const char *many, uint3
* @param desc SettingDesc struct that holds all information about the variable
* @param str input string that will be parsed based on the type of desc
* @return return the parsed value of the setting */
-static const void *string_to_val(const SettingDescBase *desc, const char *str)
+static const void *string_to_val(const SettingDescBase *desc, const char *orig_str)
{
+ const char *str = orig_str == NULL ? "" : orig_str;
switch (desc->cmd) {
case SDT_NUMX: {
char *end;
@@ -325,7 +326,7 @@ static const void *string_to_val(const SettingDescBase *desc, const char *str)
ShowInfoF("ini: invalid setting value '%s' for '%s'", str, desc->name);
break;
- case SDT_STRING:
+ case SDT_STRING: return orig_str;
case SDT_INTLIST: return str;
default: break;
}
@@ -446,12 +447,10 @@ static void ini_load_settings(IniFile *ini, const SettingDesc *sd, const char *g
break;
case SLE_VAR_STR:
case SLE_VAR_STRQ:
- if (p != NULL) {
- free(*(char**)ptr);
- *(char**)ptr = strdup((const char*)p);
- }
+ free(*(char**)ptr);
+ *(char**)ptr = p == NULL ? NULL : strdup((const char*)p);
break;
- case SLE_VAR_CHAR: *(char*)ptr = *(char*)p; break;
+ case SLE_VAR_CHAR: if (p != NULL) *(char*)ptr = *(char*)p; break;
default: NOT_REACHED(); break;
}
break;