claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reading config files with UTF-8 BOM signature

Browse Source
This commit is contained in:
Cacodemon345
2021-08-24 14:21:23 +06:00
parent fa3cb5bcee
commit 5cdfcb099c
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/config.c
View File

@@ -279,6 +279,27 @@ config_free(void)
} }
#endif #endif
static int
config_detect_bom(char *fn)
{
FILE *f;
unsigned char bom[4] = { 0, 0, 0, 0 };
#if defined(ANSI_CFG) || !defined(_WIN32)
f = plat_fopen(fn, "rt");
#else
f = plat_fopen(fn, "rt, ccs=UTF-8");
#endif
if (f == NULL) return(0);
fread(bom, 1, 3, f);
if (bom[0] == 0xEF && bom[1] == 0xBB && bom[2] == 0xBF)
{
fclose(f);
return 1;
}
fclose(f);
return 0;
}
/* Read and parse the configuration file into memory. */ /* Read and parse the configuration file into memory. */
static int static int
@@ -288,9 +309,10 @@ config_read(char *fn)
wchar_t buff[1024]; wchar_t buff[1024];
section_t *sec, *ns; section_t *sec, *ns;
entry_t *ne; entry_t *ne;
int c, d; int c, d, bom;
FILE *f; FILE *f;
bom = config_detect_bom(fn);
#if defined(ANSI_CFG) || !defined(_WIN32) #if defined(ANSI_CFG) || !defined(_WIN32)
f = plat_fopen(fn, "rt"); f = plat_fopen(fn, "rt");
#else #else
@@ -302,6 +324,8 @@ config_read(char *fn)
memset(sec, 0x00, sizeof(section_t)); memset(sec, 0x00, sizeof(section_t));
memset(&config_head, 0x00, sizeof(list_t)); memset(&config_head, 0x00, sizeof(list_t));
list_add(&sec->list, &config_head); list_add(&sec->list, &config_head);
if (bom)
fseek(f, 3, SEEK_SET);
while (1) { while (1) {
memset(buff, 0x00, sizeof(buff)); memset(buff, 0x00, sizeof(buff));