--- parser3/src/main/untaint.C	2001/08/01 12:08:40	1.58
+++ parser3/src/main/untaint.C	2001/09/14 15:41:59	1.62
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 */
-static const char *RCSId="$Id: untaint.C,v 1.58 2001/08/01 12:08:40 parser Exp $"; 
+static const char *RCSId="$Id: untaint.C,v 1.62 2001/09/14 15:41:59 parser Exp $"; 
 
 #include "pa_pool.h"
 #include "pa_string.h"
@@ -30,13 +30,13 @@ static const char *RCSId="$Id: untaint.C
 				char chunk[3]={prefix}; \
 				chunk[1]=hex[((unsigned char)*src)/0x10]; \
 				chunk[2]=hex[((unsigned char)*src)%0x10]; \
-				strncpy(dest, chunk, 3);  dest+=3; \
+				memcpy(dest, chunk, 3);  dest+=3; \
 			} else \
 				*dest++=*src; \
 			break
 #define to_char(c)  *dest++=c
 #define to_string(b, bsize)  \
-		strncpy(dest, b, bsize); \
+		memcpy(dest, b, bsize); \
 		dest+=bsize; \
 
 inline bool need_file_encode(unsigned char c){
@@ -150,7 +150,6 @@ size_t String::cstr_bufsize(Untaint_lang
 }
 
 /** @todo fix theoretical \n mem overrun in TYPO replacements
-@todo rename base_64 to quoted_printable [invalid name now]
 */
 char *String::store_to(char *dest, Untaint_lang lang, 
 					   SQL_Connection *connection,
@@ -216,7 +215,7 @@ char *String::store_to(char *dest, Untai
 				memcpy(dest, row->item.ptr, row->item.size); 
 				dest+=row->item.size;
 				break;
-			case UL_FILE_NAME:
+			case UL_FILE_SPEC:
 				// tainted, untaint language: file [name]
 				escape(switch(*src) {
 					case ' ': to_char('_');  break;
@@ -249,19 +248,19 @@ char *String::store_to(char *dest, Untai
 				if(charset) {
 					// Subject: Re: parser3: =?koi8-r?Q?=D3=C5=CD=C9=CE=C1=D2?=
 					const char *src=row->item.ptr; 
-					bool to_base_64=false;
+					bool to_quoted_printable=false;
 					for(int size=row->item.size; size--; src++) {
 						if(*src & 0x80) {
-							if(!to_base_64) {
+							if(!to_quoted_printable) {
 								dest+=sprintf(dest, "=?%.15s?Q?", charset);
-								to_base_64=true;
+								to_quoted_printable=true;
 							}
 							dest+=sprintf(dest, "=%02X", *src & 0xFF);
 						} else {
 							*dest++=*src;						
 						}
 					}
-					if(to_base_64) // close
+					if(to_quoted_printable) // close
 						dest+=sprintf(dest, "?=");
 				} else {
 					memcpy(dest, row->item.ptr, row->item.size); 
@@ -295,13 +294,22 @@ char *String::store_to(char *dest, Untai
 					_default;
 				});
 				break;
+			case UL_XML:
+				escape(switch(*src) {
+					case '&': to_string("&amp;", 5);  break;
+					case '>': to_string("&gt;", 4);  break;
+					case '<': to_string("&lt;", 4);  break;
+					case '"': to_string("&quot;", 6);  break;
+					case '\'': to_string("&apos;", 6);  break;
+					_default;
+				});
+				break;
 			case UL_HTML:
 				escape(switch(*src) {
 					case '&': to_string("&amp;", 5);  break;
 					case '>': to_string("&gt;", 4);  break;
 					case '<': to_string("&lt;", 4);  break;
 					case '"': to_string("&quot;", 6);  break;
-					//TODO: XSLT case '\'': to_string("&apos;", 6);  break;
 					_default;
 				});
 				break;
@@ -334,7 +342,6 @@ char *String::store_to(char *dest, Untai
 						case '\n': 
 							to_string("\\n", 2);
 							break;
-						//TODO: XSLT case '\'': to_string("&apos;", 6);  break;
 						_default;
 					});
 					*dest=0;
@@ -348,13 +355,6 @@ char *String::store_to(char *dest, Untai
 						// get a=>b values
 						const String& a=*static_cast<Array *>(item)->get_string(0);
 						const String& b=*static_cast<Array *>(item)->get_string(1);
-						// empty 'a' | 'b' checks
-						if(a.size()==0 || b.size()==0) {
-							pool().set_tag(0); // avoid recursion
-							THROW(0, 0, 
-								typo_dict->origin_string(), 
-								"typo table column elements must not be empty");
-						}
 						// overflow check:
 						//   b allowed to be max UNTAINT_TIMES_BIGGER then a
 						if(b.size()>UNTAINT_TIMES_BIGGER*a.size()) {
@@ -372,6 +372,7 @@ char *String::store_to(char *dest, Untai
 						src+=a.size();
 						// write 'b' to 'dest'
 						b.store_to(dest);
+						// skip 'b' in 'dest'
 						dest+=b.size();
 					} else
 						*dest++=*src++;