--- parser3/src/classes/table.C	2009/05/05 10:20:59	1.252
+++ parser3/src/classes/table.C	2009/08/08 13:30:20	1.264
@@ -5,9 +5,9 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2009/05/05 10:20:59 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/08/08 13:30:20 $";
 
-#ifndef NO_STRINGSTREAM
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 #include <sstream>
 using namespace std;
 #endif
@@ -26,7 +26,7 @@ using namespace std;
 
 class MTable: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&, HashStringValue&) { return new VTable(); }
+	Value* create_new_value(Pool&) { return new VTable(); }
 
 public:
 	MTable();
@@ -39,10 +39,6 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(table, new MTable, 0);
 
-// externs
-
-extern String cycle_data_name;
-
 #define TABLE_REVERSE_NAME "reverse"
 
 // globals
@@ -130,7 +126,7 @@ struct TableSeparators {
 	char encloser; const String* sencloser;
 
 	TableSeparators():
-		column('\t'), scolumn(new String("\t", false)),
+		column('\t'), scolumn(new String("\t")),
 		encloser(0), sencloser(0)
 	{}
 	int load( HashStringValue& options ) {
@@ -359,7 +355,7 @@ static void _load(Request& r, MethodPara
 
 		skip_empty_and_comment_lines(&data);
 		while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
-			*columns+=new String(sr.piece, 0, true);
+			*columns+=new String(sr.piece, String::L_TAINTED);
 			if(sr.delim=='\n') 
 				break;
 		}
@@ -374,7 +370,7 @@ static void _load(Request& r, MethodPara
 	while( lsplit_result sr=lsplit(&data, separators.column, '\n', separators.encloser) ) {
 		if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
 			break;
-		*row+=new String(sr.piece, 0, true);
+		*row+=new String(sr.piece, String::L_TAINTED);
 		if(sr.delim=='\n') {
 			table+=row;
 			row=new ArrayString(columns_count);
@@ -389,51 +385,51 @@ static void _load(Request& r, MethodPara
 	GET_SELF(r, VTable).set_table(table);
 }
 
-#ifdef NO_STRINGSTREAM
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 
-void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
+void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
 	if(encloser) {
-		to<<*sencloser;
+		to<<encloser;
 		// while we have 'encloser'...
 		size_t pos_after=0;
 		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
 			pos_before++; // including first encloser (and skipping it for next pos)
-            to<<from.mid(pos_after, pos_before);
-			to<<*sencloser; // doubling encloser
+			to<<from.mid(pos_after, pos_before).cstr();
+			to<<encloser; // doubling encloser
 		}
 		// last piece
 		size_t from_length=from.length();
 		if(pos_after<from_length)
-			to<<from.mid(pos_after, from_length);
+			to<<from.mid(pos_after, from_length).cstr();
 
-		to<<*sencloser;
+		to<<encloser;
 	} else
-		to<<from;
+		to<<from.cstr();
 }
 
 #else
 
-void maybe_enclose( ostringstream& to, const String& from, char encloser ) {
+void maybe_enclose( String& to, const String& from, char encloser, const String* sencloser ) {
 	if(encloser) {
-		to<<encloser;
+		to<<*sencloser;
 		// while we have 'encloser'...
 		size_t pos_after=0;
 		for( size_t pos_before; (pos_before=from.pos( encloser, pos_after ))!=STRING_NOT_FOUND; pos_after=pos_before) {
 			pos_before++; // including first encloser (and skipping it for next pos)
-            to<<from.mid(pos_after, pos_before).cstr();
-			to<<encloser; // doubling encloser
+			to<<from.mid(pos_after, pos_before);
+			to<<*sencloser; // doubling encloser
 		}
 		// last piece
 		size_t from_length=from.length();
 		if(pos_after<from_length)
-			to<<from.mid(pos_after, from_length).cstr();
+			to<<from.mid(pos_after, from_length);
 
-		to<<encloser;
+		to<<*sencloser;
 	} else
-		to<<from.cstr();
+		to<<from;
 }
 
-#endif
+#endif // don't use stringstream
 
 static void _save(Request& r, MethodParams& params) {
 	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
@@ -480,52 +476,7 @@ static void _save(Request& r, MethodPara
 
 	Table& table=GET_SELF(r, VTable).table();
 
-#ifdef NO_STRINGSTREAM
-
-	String sdata;
-	if(output_column_names) {
-		if(table.columns()) { // named table
-			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
-				maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
-				if(i.has_next())
-					sdata<<*separators.scolumn;
-			}
-		} else { // nameless table [we were asked to output column names]
-			if(int lsize=table.count()?table[0]->count():0)
-				for(int column=0; column<lsize; column++) {
-					char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
-					sdata.append_know_length(cindex_tab, 
-						snprintf(cindex_tab, MAX_NUMBER, 
-							column<lsize-1?"%d%c":"%d", column, separators.column),
-							String::L_CLEAN);
-				}
-			else
-				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
-		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
-	}
-
-	// data lines
-	Array_iterator<ArrayString*> i(table);
-	while(i.has_next()) {
-		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
-			maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
-			if(c.has_next())
-				sdata<<*separators.scolumn;
-		}
-		sdata.append_know_length("\n", 1, String::L_CLEAN);
-	}
-
-	// write
-	{
-		const char* data_cstr=sdata.cstr();
-		file_write(file_spec, 
-			data_cstr, sdata.length(), true, do_append);
-		if(*data_cstr) // not empty (when empty it's not heap memory)
-			pa_free((void*)data_cstr); // not needed anymore
-	}
-
-#else
+#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4))
 
 	ostringstream ost(stringstream::out);
 
@@ -575,7 +526,52 @@ static void _save(Request& r, MethodPara
 		file_write(file_spec, data_cstr, data.length(), true /* as text */, do_append);
 	}
 
-#endif
+#else
+
+	String sdata;
+	if(output_column_names) {
+		if(table.columns()) { // named table
+			for(Array_iterator<const String*> i(*table.columns()); i.has_next(); ) {
+				maybe_enclose( sdata, *i.next(), separators.encloser, separators.sencloser );
+				if(i.has_next())
+					sdata<<*separators.scolumn;
+			}
+		} else { // nameless table [we were asked to output column names]
+			if(int lsize=table.count()?table[0]->count():0)
+				for(int column=0; column<lsize; column++) {
+					char *cindex_tab=new(PointerFreeGC) char[MAX_NUMBER];
+					sdata.append_know_length(cindex_tab, 
+						snprintf(cindex_tab, MAX_NUMBER, 
+							column<lsize-1?"%d%c":"%d", column, separators.column),
+							String::L_CLEAN);
+				}
+			else
+				sdata.append_help_length("empty nameless table", 0, String::L_CLEAN);
+		}
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
+	}
+
+	// data lines
+	Array_iterator<ArrayString*> i(table);
+	while(i.has_next()) {
+		for(Array_iterator<const String*> c(*i.next()); c.has_next(); ) {
+			maybe_enclose( sdata, *c.next(), separators.encloser, separators.sencloser );
+			if(c.has_next())
+				sdata<<*separators.scolumn;
+		}
+		sdata.append_know_length("\n", 1, String::L_CLEAN);
+	}
+
+	// write
+	{
+		const char* data_cstr=sdata.cstr();
+		file_write(file_spec, 
+			data_cstr, sdata.length(), true, do_append);
+		if(*data_cstr) // not empty (when empty it's not heap memory)
+			pa_free((void*)data_cstr); // not needed anymore
+	}
+
+#endif // don't use stringstream
 }
 
 static void _count(Request& r, MethodParams&) {
@@ -611,8 +607,7 @@ static void _offset(Request& r, MethodPa
 }
 
 static void _menu(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	InCycle temp(r);
 
 	Value& body_code=params.as_junction(0, "body must be code");
 	
@@ -1049,7 +1044,7 @@ public:
 
 	bool add_column(SQL_Error& error, const char *str, size_t length) {
 		try {
-			columns+=new String(str, length, true);
+			columns+=new String(str, String::L_TAINTED, length);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_column");
@@ -1077,10 +1072,7 @@ public:
 	}
 	bool add_row_cell(SQL_Error& error, const char* str, size_t length) {
 		try {
-			String& cell=*new String;
-			if(length)
-				cell.append_know_length(str, length, String::L_TAINTED);
-			*row+=&cell;
+			*row+=new String(str, String::L_TAINTED, length);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Table_sql_event_handlers::add_row_cell");
@@ -1097,7 +1089,7 @@ static void marshal_bind(
 {
 	SQL_Driver::Placeholder& ph=**pptr;
 	ph.name=aname.cstr();
-	ph.value=avalue->as_string().cstr(String::L_UNSPECIFIED);
+	ph.value=avalue->as_string().untaint_cstr(String::L_AS_IS);
 	ph.is_null=avalue->get_class()==void_class;
 	ph.were_updated=false;
 
@@ -1122,10 +1114,7 @@ void unmarshal_bind_updates(HashStringVa
 			if(ph->is_null)
 				value=VVoid::get();
 			else
-				if(ph->value)
-					value=new VString(*new String(ph->value, 0, true/*tainted*/));
-				else
-					value=new VString(*new String());					
+				value=new VString(*new String(ph->value, String::L_TAINTED));
 			hash.put(ph->name, value);
 		}
 }
@@ -1170,8 +1159,8 @@ static void _sql(Request& r, MethodParam
 
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String&  statement_string=r.process_to_string(statement);
-	const char* statement_cstr=
-		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+
 	Table_sql_event_handlers handlers;
 #ifdef RESOURCES_DEBUG
 	struct timeval mt[2];