From 7d01ae57c61c604ed6078bb3910283d9a8a6ffc7 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 29 May 2010 18:36:20 +0200 Subject: Only skip the UTF-8 BOM for Lua scripts libxml2 should be able to handle files with a BOM fine. Reviewed-by: Bertram --- src/scripting/script.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/scripting/script.cpp') diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp index 01d237f3..fe3c5d8d 100644 --- a/src/scripting/script.cpp +++ b/src/scripting/script.cpp @@ -27,6 +27,8 @@ #include #include +#include + typedef std::map< std::string, Script::Factory > Engines; static Engines *engines = NULL; @@ -70,15 +72,22 @@ void Script::update() execute(); } +static char *skipPotentialBom(char *text) +{ + // Based on the C version of bomstrip + const char * const utf8Bom = "\xef\xbb\xbf"; + const int bomLength = strlen(utf8Bom); + return (strncmp(text, utf8Bom, bomLength) == 0) ? text + bomLength : text; +} + bool Script::loadFile(const std::string &name) { int size; - // Note: The file is checked for UTF-8 BOM. - char *buffer = ResourceManager::loadFile(name, size, true); + char *buffer = ResourceManager::loadFile(name, size); if (buffer) { mScriptFile = name; - load(buffer); + load(skipPotentialBom(buffer)); free(buffer); return true; } else { -- cgit v1.2.3-70-g09d2