--- parser3/src/main/untaint.C	2003/04/08 08:27:34	1.115.2.12.2.23
+++ parser3/src/main/untaint.C	2003/08/15 11:40:45	1.117.2.1
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_UNTAINT_C="$Date: 2003/04/08 08:27:34 $";
+static const char* IDENT_UNTAINT_C="$Date: 2003/08/15 11:40:45 $";
 
 
 #include "pa_string.h"
@@ -81,7 +81,7 @@ inline bool need_file_encode(unsigned ch
 	return strchr(
 			  "*?'\"<>|"
 #ifndef WIN32
-			  ":\\~"
+			  ":\\"
 #endif
 			  , c)!=0;
 }
@@ -183,13 +183,12 @@ String& String::append_to(String& dest,
 
 	// next: fragment infos
 	
-	if(lang==L_PASS_APPENDED) // without language-chage string?
+	if(lang==L_PASS_APPENDED) // without language-change?
 		dest.fragments.append(fragments);
 	else if(forced) //forcing passed lang?
 		dest.fragments+=Fragment(lang, length());
 	else if(lang&L_OPTIMIZE_BIT) {
-		Array_iterator<ArrayFragment::element_type> i(fragments);
-		while(i.has_next()) {
+		for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); ) {
 			const Fragment fragment=i.next();
 			// main idea here:
 			// tainted piece would get OPTIMIZED bit from 'lang'
@@ -202,8 +201,7 @@ String& String::append_to(String& dest,
 				fragment.length);
 		}
 	} else { // The core idea: tainted pieces got marked with context's lang
-		Array_iterator<ArrayFragment::element_type> i(fragments);
-		while(i.has_next()) {
+		for(Array_iterator<ArrayFragment::element_type> i(fragments); i.has_next(); ) {
 			const Fragment fragment=i.next();
 			dest.fragments+=Fragment(
 				fragment.lang==L_TAINTED?lang:fragment.lang,
@@ -211,6 +209,7 @@ String& String::append_to(String& dest,
 		}
 	}
 
+	ASSERT_STRING_INVARIANT(dest);
 	return dest;
 }
 
@@ -247,6 +246,14 @@ inline bool mail_header_char_valid_withi
 		|| c>='0' && c<='9'
 		|| strchr("!*+-/", c);
 }
+inline bool addr_spec_soon(const char *src) {
+	for(char c; c=*src; src++)
+		if(c=='<')
+			return true;
+		else if(!(c==' ' || c=='\t'))
+			return false;
+	return false;
+}
 /**
 	RFC 
 	Upper case should be used for hexadecimal digits "A" through "F"
@@ -316,7 +323,7 @@ StringBody String::cstr_to_string_body(L
 			// tainted, untaint language: file [name]
 			escape(
 				// Macintosh has problems with small Russian letter 'r'
-				if( c=='\xF0' && charsets && charsets->source().name()=="windows-1251" ) {
+				if( c=='\xF0' && charsets && charsets->source().NAME()=="WINDOWS-1251" ) {
 					// fixing that letter for most common charset
 					to_char('p');
 				} else // fallback to default
@@ -329,19 +336,14 @@ StringBody String::cstr_to_string_body(L
 				const char *fragment_str=body.mid(fragment_begin, fragment_length).cstr();
 				// skip source [we use recoded version]
 				pa_CORD_pos_advance(pos, fragment_length);
-				const void *client_ptr;
-				size_t client_size;
+				String::C output(fragment_str, fragment_length);
 				if(charsets) 
-					Charset::transcode(
-						charsets->source(), fragment_str, fragment_length,
-						charsets->client(), client_ptr, client_size);
-				else {
-					client_ptr=fragment_str; 
-					client_size=fragment_length;
-				}
+					output=Charset::transcode(output, 
+						charsets->source(), 
+						charsets->client());
 
 				char c;
-				for(const char* src=(const char* )client_ptr; c=*src++; ) 
+				for(const char* src=output.str; c=*src++; ) 
 					encode(need_uri_encode, '%', c);
 			}
 			break;
@@ -361,7 +363,7 @@ StringBody String::cstr_to_string_body(L
 				// skip source [we use recoded version]
 				pa_CORD_pos_advance(pos, mail_size);
 
-				const char* charset_name=charsets->mail().name().cstr();
+				const char* charset_name=charsets->mail().NAME().cstr();
 
 				// Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?=
 				bool to_quoted_printable=false;
@@ -370,7 +372,7 @@ StringBody String::cstr_to_string_body(L
 				uchar c;
 				for(const char* src=mail_ptr; c=(uchar)*src++; ) {
 					//RFC   + An 'encoded-word' MUST NOT appear in any portion of an 'addr-spec'.
-					if(to_quoted_printable && (c==',' || c=='<')) {
+					if(to_quoted_printable && (c==',' || addr_spec_soon(src) || c == '"')) {
 						email=c=='<';
 						to_string("?=");
 						to_quoted_printable=false;