summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-07-19 01:33:10 +0200
committerHaru <haru@dotalux.com>2013-07-19 01:57:33 +0200
commitc600af3ad4cdce4bf8f6f153c2599fca9902d426 (patch)
tree1f56b168799389bbd3c1edeb020fbacc72821286
parente26c9504e825abe8fe50eca28bf3b89de8e4bd9c (diff)
downloadhercules-c600af3ad4cdce4bf8f6f153c2599fca9902d426.tar.gz
hercules-c600af3ad4cdce4bf8f6f153c2599fca9902d426.tar.bz2
hercules-c600af3ad4cdce4bf8f6f153c2599fca9902d426.tar.xz
hercules-c600af3ad4cdce4bf8f6f153c2599fca9902d426.zip
Added support for apostrophes (') in libconfig's setting names
Special thanks to Ind for pointing me in the right direction and testing the patch. Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--3rdparty/libconfig/libconfig.c2
-rw-r--r--3rdparty/libconfig/scanner.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c
index 4cc272c9f..e2c583310 100644
--- a/3rdparty/libconfig/libconfig.c
+++ b/3rdparty/libconfig/libconfig.c
@@ -540,7 +540,7 @@ static int __config_validate_name(const char *name)
for(++p; *p; ++p)
{
- if(! (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) || strchr("*_-", (int)*p)))
+ if(! (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) || strchr("*_-'", (int)*p)))
return(CONFIG_FALSE);
}
diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c
index c2eb7d188..118fcf8ad 100644
--- a/3rdparty/libconfig/scanner.c
+++ b/3rdparty/libconfig/scanner.c
@@ -399,7 +399,7 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 4, 5, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 1, 6, 7, 1, 1, 1, 1, 8,
+ 1, 2, 1, 6, 7, 1, 1, 1, 26, 8,
9, 10, 11, 12, 13, 14, 15, 16, 17, 17,
17, 17, 17, 17, 17, 17, 17, 18, 19, 1,
20, 1, 1, 21, 22, 23, 23, 23, 24, 25,