From 6c6e642acc53fe6f5691ed14bb581c10149f6b69 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 23 Jun 2010 07:02:20 +0400 Subject: [PATCH] [10098] Re-apply to ACE hack for support utf8 config files It has been applied in past to old config loading code. --- dep/ACE_wrappers/ace/Configuration_Import_Export.cpp | 7 +++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp index 88e6d66f2..dbfc306c8 100644 --- a/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp +++ b/dep/ACE_wrappers/ace/Configuration_Import_Export.cpp @@ -411,6 +411,13 @@ ACE_Ini_ImpExp::import_config (const ACE_TCHAR* filename) if (!in) return -1; + // MaNGOS addition: Try read utf8 header and skip it if exist for support utf8 format file + ACE_UINT32 utf8header = 0; + fgets((char*)&utf8header, 4, in); // Try read header + if (utf8header != ACE_UINT32(0x00BFBBEF)) // If not found + fseek(in, 0, SEEK_SET); // Reset read position + // MaNGOS addition - end + // @@ Make this a dynamic size! ACE_TCHAR buffer[4096]; ACE_Configuration_Section_Key section; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f64a6b9f6..baa0efd61 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10097" + #define REVISION_NR "10098" #endif // __REVISION_NR_H__