forked from github/server
8166519d30
fix endless loop in error-line counting.
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
#include "bind_config.h"
|
|
|
|
#include <platform.h>
|
|
#include <kernel/types.h>
|
|
#include <kernel/jsonconf.h>
|
|
#include <util/log.h>
|
|
#include <util/language.h>
|
|
#include <cJSON.h>
|
|
#include <string.h>
|
|
|
|
#include "kernel/building.h"
|
|
#include "kernel/race.h"
|
|
#include "kernel/ship.h"
|
|
#include "kernel/spell.h"
|
|
#include "kernel/spellbook.h"
|
|
#include "kernel/terrain.h"
|
|
|
|
void config_reset(void) {
|
|
default_locale = 0;
|
|
free_locales();
|
|
free_spells();
|
|
free_buildingtypes();
|
|
free_shiptypes();
|
|
free_races();
|
|
free_spellbooks();
|
|
}
|
|
|
|
int config_parse(const char *json)
|
|
{
|
|
cJSON * conf = cJSON_Parse(json);
|
|
if (conf) {
|
|
json_config(conf);
|
|
cJSON_Delete(conf);
|
|
return 0;
|
|
} else {
|
|
int line;
|
|
char buffer[10];
|
|
const char *xp = json, *lp, *ep = cJSON_GetErrorPtr();
|
|
for (line=0,lp=xp;xp && xp<ep;++line,lp=xp+1) {
|
|
xp = strchr(lp, '\n');
|
|
}
|
|
xp = (ep > json + 10) ? ep - 10 : json;
|
|
strncpy(buffer, xp, sizeof(buffer));
|
|
buffer[9] = 0;
|
|
log_error("json parse error in line %d, position %d, near `%s`\n", line, ep-lp, buffer);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
int config_read(const char *filename)
|
|
{
|
|
return 1;
|
|
}
|
|
|