--- parser3/src/main/pa_charsets.C	2001/12/26 08:46:13	1.3
+++ parser3/src/main/pa_charsets.C	2025/05/26 00:52:15	1.29
@@ -1,51 +1,61 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_charsets.C,v 1.3 2001/12/26 08:46:13 paf Exp $
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #include "pa_charsets.h"
-#include "pa_charset.h"
+
+volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.29 2025/05/26 00:52:15 moko Exp $" IDENT_PA_CHARSETS_H;
+
+// defines for globals
+
+#define CHARSET_UTF8_NAME "UTF-8"
 
 // globals
 
-Charsets *charsets;
+static String charset_utf8_name(CHARSET_UTF8_NAME);
+Charset pa_UTF8_charset(0, charset_utf8_name, 0/*no file=system*/);
 
-//
+Charsets pa_charsets;
 
-Charsets::Charsets(Pool& apool) : Hash(apool) {
-}
+// methods
 
-static void destroy_charset(const Hash::Key& , Hash::Val *& value, void *) {
-	static_cast<Charset *>(value)->~Charset();	
+Charsets::Charsets() {
+	put(pa_UTF8_charset.NAME(), &pa_UTF8_charset);
 }
 
-Charsets::~Charsets() {
-	for_each(destroy_charset);
+Charset& Charsets::get(String::Body ANAME) {
+	ANAME=String::Body(str_upper(ANAME.cstr(), ANAME.length()));
+	if(Charset* result=HashString<value_type>::get(ANAME))
+		return *result;
+	else
+		throw Exception(PARSER_RUNTIME, new String(ANAME, String::L_TAINTED), "unknown charset");
 }
 
-Charset& Charsets::get_charset(const String& name) {
-	if(Charset *result=(Charset *)get(name))
+Charset& Charsets::get_direct(const char *ANAME) {
+	if(Charset* result=HashString<value_type>::get(ANAME))
 		return *result;
 	else
-		throw Exception(0, 0,
-			&name,
-			"unknown charset");
+		throw Exception(PARSER_RUNTIME, new String(ANAME, String::L_TAINTED), "unknown charset");
 }
 
-void Charsets::load_charset(const String& request_name, const String& request_file_spec) {
+Charset* Charsets::checkBOM(char *&body,size_t &body_size, Charset* enforced_charset){
+	if((!enforced_charset || enforced_charset->isUTF8()) && (body_size>=3 && strncmp(body, "\xEF\xBB\xBF", 3)==0)){
+		// skip UTF-8 signature (BOM code)
+		body+=3;
+		body_size-=3;
+		return &pa_UTF8_charset;
+	}
+	return enforced_charset;
+}
+
+void Charsets::load_charset(Request_charsets& charsets, String::Body ANAME, const String& afile_spec) {
+	ANAME=String::Body(str_upper(ANAME.cstr(), ANAME.length()));
 	//we know that charset?
-	if(get(request_name)) 
+	if(HashString<value_type>::get(ANAME))
 		return; // don't load it then
 
-	const char *name_cstr=request_name.cstr();
-	char *global_name_cstr=(char *)malloc(strlen(name_cstr)+1);
-	strcpy(global_name_cstr, name_cstr);
-	// make global_name string on global pool
-	String& global_name=*NEW String(pool(), global_name_cstr);
-	
-	put(request_name, NEW Charset(pool(), global_name, &request_file_spec));
-}
\ No newline at end of file
+	put(ANAME, new Charset(&charsets, ANAME, &afile_spec));
+}