--- parser3/src/main/pa_charsets.C	2003/01/28 11:38:50	1.11.2.2
+++ parser3/src/main/pa_charsets.C	2016/07/29 20:24:16	1.22
@@ -1,42 +1,60 @@
 /** @file
 	Parser: sql driver manager implementation.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_CHARSETS_C="$Date: 2003/01/28 11:38:50 $";
-
 #include "pa_charsets.h"
 
-// statics
+volatile const char * IDENT_PA_CHARSETS_C="$Id: pa_charsets.C,v 1.22 2016/07/29 20:24:16 moko Exp $" IDENT_PA_CHARSETS_H;
+
+// defines for globals
+
+#define CHARSET_UTF8_NAME "UTF-8"
 
 // globals
 
+Charset UTF8_charset(0, *new String(CHARSET_UTF8_NAME), 0/*no file=system*/);
+
 Charsets charsets;
 
-//
+// methods
 
 Charsets::Charsets() {
-	put(UTF8_charset->name(), UTF8_charset);
+	put(UTF8_charset.NAME(), &UTF8_charset);
 }
 
-CharsetPtr Charsets::get(ConstStringPtr aname) {
-	if(CharsetPtr result=Hash<key_type, value_type>::get(aname))
-		return result;
+Charset& Charsets::get(String::Body ANAME) {
+	ANAME=str_upper(ANAME.cstr(), ANAME.length());
+	if(Charset* result=HashString<value_type>::get(ANAME))
+		return *result;
 	else
-		throw Exception("parser.runtime",
-			aname,
-			"unknown charset");
+		throw Exception(PARSER_RUNTIME, new String(ANAME, String::L_TAINTED), "unknown charset");
+}
+
+Charset& Charsets::get_direct(const char *ANAME) {
+	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::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 &UTF8_charset;
+	}
+	return enforced_charset;
 }
 
-void Charsets::load_charset(ConstStringPtr arequest_name, ConstStringPtr arequest_file_spec) {
+void Charsets::load_charset(Request_charsets& charsets, String::Body ANAME, const String& afile_spec) {
+	ANAME=str_upper(ANAME.cstr(), ANAME.length());
 	//we know that charset?
-	if(get(arequest_name)) 
+	if(HashString<value_type>::get(ANAME))
 		return; // don't load it then
 
-	// make global_name string on cache_pool pool
-	StringPtr global_name(new String(arequest_name->cstr(charsets_pool)));
-	
-	put(global_name, value_type(new Charset(global_name, arequest_file_spec, &charsets_pool)));
+	put(ANAME, new Charset(&charsets, ANAME, &afile_spec));
 }