--- parser3/src/main/pa_string.C	2001/03/07 09:29:54	1.32
+++ parser3/src/main/pa_string.C	2001/03/19 17:42:16	1.46
@@ -1,5 +1,11 @@
-/*
-  $Id: pa_string.C,v 1.32 2001/03/07 09:29:54 paf Exp $
+/** @file
+	Parser: string class. @see untaint.C.
+
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: pa_string.C,v 1.46 2001/03/19 17:42:16 paf Exp $
 */
 
 #include <string.h>
@@ -11,7 +17,7 @@
 
 // String
 
-String::String(Pool& apool) :
+String::String(Pool& apool, const char *src, bool tainted) :
 	Pooled(apool) {
 	last_chunk=&head;
 	head.count=CR_PREALLOCATED_COUNT;
@@ -19,6 +25,12 @@ String::String(Pool& apool) :
 	head.preallocated_link=0;
 	link_row=&head.rows[head.count];
 	fused_rows=fsize=0;
+
+	if(src)
+		if(tainted)
+			APPEND_TAINTED(src, 0, 0, 0);
+		else
+			APPEND(src, 0, 0, 0);
 }
 
 void String::expand() {
@@ -32,11 +44,10 @@ void String::expand() {
 	link_row->link=0;
 }
 
-String::String(const String& src) :
-	Pooled(src.pool()) {
+String::String(const String& src) :	Pooled(src.pool()) {
 	head.count=CR_PREALLOCATED_COUNT;
 	
-	int src_used_rows=src.used_rows();
+	int src_used_rows=src.fused_rows;
 	if(src_used_rows<=head.count) {
 		// all new rows fit into preallocated area
 		int curr_chunk_rows=head.count;
@@ -90,13 +101,14 @@ String::String(const String& src) :
 	fsize=src.fsize;
 }
 
-String& String::operator += (const String& src) {
-	int src_used_rows=src.used_rows();
+String& String::append(const String& src, Untaint_lang lang, bool forced) {
+	int src_used_rows=src.fused_rows;
 	int dst_free_rows=link_row-append_here;
 	
 	if(src_used_rows<=dst_free_rows) {
 		// all new rows fit into last chunk
 		memcpy(append_here, src.head.rows, sizeof(Chunk::Row)*src_used_rows);
+		set_lang(append_here, lang, forced, src_used_rows);
 		append_here+=src_used_rows;
 	} else {
 		// not all new rows fit into last chunk: shrinking it to used part,
@@ -121,6 +133,7 @@ String& String::operator += (const Strin
 				// not last source chunk
 				// taking it all
 				memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*old_count);
+				set_lang(new_rows, lang, forced, old_count);
 				new_rows+=old_count;
 				rows_left_to_copy-=old_count;
 
@@ -129,6 +142,7 @@ String& String::operator += (const Strin
 				// the last source chunk
 				// taking only those rows of chunk that _left_to_copy
 				memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*rows_left_to_copy);
+				set_lang(new_rows, lang, forced, rows_left_to_copy);
 				break;
 			}
 		}
@@ -139,7 +153,34 @@ String& String::operator += (const Strin
 
 	return *this;
 }
+void String::set_lang(Chunk::Row *row, Untaint_lang lang, bool forced, size_t size) {
+	if(lang==PASS_APPENDED)
+		return;
+
+	while(size--) {
+		Untaint_lang& item_lang=(row++)->item.lang;
+		if(item_lang==YES || forced) // tainted? need untaint language assignment
+			item_lang=lang;  // assign untaint language
+	}
+}
 
+/*void String::change_lang(Untaint_lang lang) {
+	Chunk *chunk=&head; 
+	do {
+		Chunk::Row *row=chunk->rows;
+		for(int i=0; i<chunk->count; i++) {
+			if(row==append_here)
+				goto break2;
+
+			row->item.lang=lang;
+			row++;
+		}
+		chunk=row->link;
+	} while(chunk);
+break2:
+	return;
+}
+*/
 String& String::real_append(STRING_APPEND_PARAMS) {
 	if(!src)
 		return *this;
@@ -153,6 +194,7 @@ String& String::real_append(STRING_APPEN
 
 	append_here->item.ptr=src;
 	fsize+=append_here->item.size=size;
+	append_here->item.lang=tainted?YES:NO;
 #ifndef NO_STRING_ORIGIN
 	append_here->item.origin.file=file;
 	append_here->item.origin.line=line;
@@ -162,28 +204,6 @@ String& String::real_append(STRING_APPEN
 	return *this;
 }
 
-char *String::cstr() const {
-	char *result=static_cast<char *>(malloc(size()+1));
-
-	char *copy_here=result;
-	const Chunk *chunk=&head; 
-	do {
-		const Chunk::Row *row=chunk->rows;
-		for(int i=0; i<chunk->count; i++) {
-			if(row==append_here)
-				goto break2;
-
-			memcpy(copy_here, row->item.ptr, row->item.size);
-			copy_here+=row->item.size;
-			row++;
-		}
-		chunk=row->link;
-	} while(chunk);
-break2:
-	*copy_here=0;
-	return result;
-}
-
 uint String::hash_code() const {
 	uint result=0;
 
@@ -218,6 +238,11 @@ int String::cmp(const String& src) const
 	bool b_break=false;
 	int result;
 	while(true) {
+		a_break=a_row==a_end;
+		b_break=b_row==b_end;
+		if(a_break || b_break)
+			break;
+
 		int size_diff=
 			(a_row->item.size-a_offset)-
 			(b_row->item.size-b_offset);
@@ -242,11 +267,6 @@ int String::cmp(const String& src) const
 			a_row++; a_countdown--; a_offset=0;
 		}
 
-		a_break=a_row==a_end;
-		b_break=b_row==b_end;
-		if(a_break || b_break)
-			break;
-
 		if(!a_countdown) {
 			a_chunk=a_row->link;
 			a_row=a_chunk->rows;
@@ -267,7 +287,7 @@ int String::cmp(const String& src) const
 	return result;
 }
 
-bool String::operator == (char* b_ptr) const {
+bool String::operator == (const char* b_ptr) const {
 	size_t b_size=b_ptr?strlen(b_ptr):0;
 	if(size() != b_size)
 		return false;
@@ -314,3 +334,14 @@ bool String::operator == (char* b_ptr) c
 	}
 	return a_break==b_break;
 }
+
+#ifndef NO_STRING_ORIGIN
+const Origin& String::origin() const { 
+	if(!fused_rows)
+		THROW(0, 0, 
+		0,
+		"String::origin() of empty string called");
+	
+	return head.rows[0].item.origin; 
+}
+#endif