--- parser3/src/main/untaint.C	2003/03/20 09:41:47	1.115.2.12.2.4
+++ parser3/src/main/untaint.C	2003/03/20 15:05:59	1.115.2.12.2.7
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_UNTAINT_C="$Date: 2003/03/20 09:41:47 $";
+static const char* IDENT_UNTAINT_C="$Date: 2003/03/20 15:05:59 $";
 
 
 #include "pa_string.h"
@@ -18,7 +18,9 @@ static const char* IDENT_UNTAINT_C="$Dat
 #include "pa_charset.h"
 #include "pa_request_charsets.h"
 
+extern "C" { // author forgot to do that
 #include "ec.h"
+}
 
 //#define PA_SQL
 
@@ -27,7 +29,7 @@ static const char* IDENT_UNTAINT_C="$Dat
 #endif
 
 #define escape(action) \
-	for(; fragment_size--; CORD_next(pos)) { \
+	for(; fragment_length--; CORD_next(pos)) { \
 		char c=CORD_pos_fetch(pos); \
 		action \
 	}
@@ -154,7 +156,7 @@ String& String::append_to(String& dest,
 	if(lang==UL_PASS_APPENDED) // without language-chage string?
 		dest.fragments.append(fragments, 0, fragments.count());
 	else if(forced) //forcing passed lang?
-		dest.fragments+=Fragment(lang, size());
+		dest.fragments+=Fragment(lang, length());
 	else if(lang&UL_OPTIMIZE_BIT) {
 		Array_iterator<ArrayFragment::element_type> i(fragments);
 		while(i.has_next()) {
@@ -167,7 +169,7 @@ String& String::append_to(String& dest,
 				fragment.lang==UL_TAINTED?lang:(
 					fragment.lang==UL_CLEAN?UL_CLEAN|UL_OPTIMIZE_BIT: // ORing with OPTIMIZED flag
 						fragment.lang)),
-				fragment.size);
+				fragment.length);
 		}
 	} else { // The core idea: tainted pieces got marked with context's lang
 		Array_iterator<ArrayFragment::element_type> i(fragments);
@@ -175,7 +177,7 @@ String& String::append_to(String& dest,
 			const Fragment& fragment=i.next();
 			dest.fragments+=Fragment(
 				fragment.lang==UL_TAINTED?lang:fragment.lang,
-				fragment.size);
+				fragment.length);
 		}
 	}
 
@@ -229,12 +231,12 @@ CORD String::cstr_to_cord(Untaint_lang l
 
 	bool whitespace=true;
 
-	size_t fragment_start=0;
+	size_t fragment_begin=0;
 	size_t fragment_end;
-	for(Array_iterator<Fragment> i(fragments); i.has_next(); fragment_start=fragment_end) {
+	for(Array_iterator<Fragment> i(fragments); i.has_next(); fragment_begin=fragment_end) {
 		const Fragment& fragment=i.next();
-		size_t fragment_size=fragment.size;
-		fragment_end=fragment_start+fragment_size;
+		size_t fragment_length=fragment.length;
+		fragment_end=fragment_begin+fragment_length;
 
 		Untaint_lang to_lang=lang==UL_UNSPECIFIED?fragment.lang:lang;
 
@@ -249,7 +251,7 @@ CORD String::cstr_to_cord(Untaint_lang l
 			// for ^process{body} evaluation
 
 			// tainted, untaint language: as-is
-			ec_append(result, pos, fragment_size);
+			ec_append(result, pos, fragment_length);
 			break;
 		case UL_FILE_SPEC:
 			// tainted, untaint language: file [name]
@@ -262,21 +264,22 @@ CORD String::cstr_to_cord(Untaint_lang l
 					encode(need_file_encode, '_'); 
 			);
 			break;
+#ifdef LATER
 		case UL_URI:
 			// tainted, untaint language: uri
 			{
 				const char *substr=
 					CORD_to_const_char_star(
-						CORD_substr(body, fragment_start, fragment_size));
+						CORD_substr(body, fragment_begin, fragment_length));
 				const void *client_ptr;
 				size_t client_size;
 				if(charsets) 
 					Charset::transcode(
-						charsets->source(), substr, fragment_size,
+						charsets->source(), substr, fragment_length,
 						charsets->client(), client_ptr, client_size);
 				else {
 					client_ptr=substr; 
-					client_size=fragment_size;
+					client_size=fragment_length;
 				}
 
 				char c;
@@ -284,6 +287,7 @@ CORD String::cstr_to_cord(Untaint_lang l
 					encode(need_uri_encode, '%');
 			}
 			break;
+#endif
 		case UL_HTTP_HEADER:
 			// tainted, untaint language: http-field-content-text
 			escape(
@@ -296,7 +300,7 @@ CORD String::cstr_to_cord(Untaint_lang l
 			// http://www.ietf.org/rfc/rfc2047.txt
 			if(charsets) {
 				const void *mail_ptr=fragment.ptr;
-				size_t mail_size=fragment_size;
+				size_t mail_size=fragment_length;
 				const char* charset_name=charsets->mail().name()->cstr();
 
 				// Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?=
@@ -333,8 +337,8 @@ CORD String::cstr_to_cord(Untaint_lang l
 					dest+=sprintf(dest, "?=");
 			
 			} else {
-				memcpy(dest, fragment.ptr, fragment_size); 
-				dest+=fragment_size;
+				memcpy(dest, fragment.ptr, fragment_length); 
+				dest+=fragment_length;
 			}
 			break;
 #endif
@@ -351,11 +355,11 @@ CORD String::cstr_to_cord(Untaint_lang l
 			// tainted, untaint language: sql
 			if(connection) {
 				dest+=connection->quote(0, 
-					CORD_substr(body, fragment_start, fragment_size), 
-					fragment_size);
+					CORD_substr(body, fragment_begin, fragment_length), 
+					fragment_length);
 ...^^^
 
-				dest+=connection->quote(dest, fragment.ptr, fragment_size);
+				dest+=connection->quote(dest, fragment.ptr, fragment_length);
 			else
 				throw Exception(0,
 					0,