--- parser3/src/classes/file.C	2016/10/04 13:23:45	1.252
+++ parser3/src/classes/file.C	2016/11/28 22:42:57	1.256
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.252 2016/10/04 13:23:45 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.256 2016/11/28 22:42:57 moko Exp $";
 
 // defines
 
@@ -503,7 +503,8 @@ static void _exec_cgi(Request& r, Method
 	env.put("SCRIPT_NAME", script_name);
 
 	// environment & stdin from param
-	String *in=new String();
+	bool in_is_text_mode=true;
+	String::C in;
 	Charset *charset=0; // default script works raw_in 'source' charset = no transcoding needed
 	if(param_index < params.count()) {
 		if(HashStringValue* user_env=params.as_hash(param_index++, "env")) {
@@ -523,14 +524,13 @@ static void _exec_cgi(Request& r, Method
 			if(info.vstdin) {
 				if(const String* sstdin=info.vstdin->get_string()) {
 					// untaint stdin
-					in = new String(sstdin->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets), String::L_AS_IS);
+					in = String::C(sstdin->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets));
 				} else
-					if(VFile* vfile=static_cast<VFile *>(info.vstdin->as("file")))
-						in->append_know_length((const char* )vfile->value_ptr(), vfile->value_size(), String::L_TAINTED);
-					else
-						throw Exception(PARSER_RUNTIME,
-							0,
-							STDIN_EXEC_PARAM_NAME " parameter must be string or file");
+					if(VFile* vfile=static_cast<VFile *>(info.vstdin->as("file"))){
+						in = String::C((const char* )vfile->value_ptr(), vfile->value_size());
+						in_is_text_mode = vfile->is_text_mode();
+					} else
+						throw Exception(PARSER_RUNTIME, 0, STDIN_EXEC_PARAM_NAME " parameter must be string or file");
 			}
 		}
 	}
@@ -563,14 +563,15 @@ static void _exec_cgi(Request& r, Method
 	if(charset) {
 		Charset::transcode(env, r.charsets.source(), *charset);
 		Charset::transcode(argv, r.charsets.source(), *charset);
-		in=&Charset::transcode(*in, r.charsets.source(), *charset);
+		if(in_is_text_mode)
+			in=Charset::transcode(in, r.charsets.source(), *charset);
 	}
 	// @todo 
 	// ifdef WIN32 do  OEM->ANSI transcode on some(.cmd?) programs to 
 	// match silent conversion in OS
 
 	// exec!
-	PA_exec_result execution=pa_exec(false/*forced_allow*/, script_name, &env, argv, *in);
+	PA_exec_result execution=pa_exec(false/*forced_allow*/, script_name, &env, argv, in);
 
 	File_read_result *file_out=&execution.out;
 	String *real_err=&execution.err;
@@ -745,7 +746,7 @@ static void _list(Request& r, MethodPara
 	);
 
 	// write out result
-	r.write_no_lang(*new VTable(&table));
+	r.write(*new VTable(&table));
 }
 
 #ifndef DOXYGEN
@@ -758,7 +759,7 @@ struct Lock_execute_body_info {
 static void lock_execute_body(int , void *ainfo) {
 	Lock_execute_body_info& info=*static_cast<Lock_execute_body_info *>(ainfo);
 	// execute body
-	info.r->write_assign_lang(info.r->process(*info.body_code));
+	info.r->write(info.r->process(*info.body_code));
 }
 
 static void _lock(Request& r, MethodParams& params) {
@@ -798,7 +799,7 @@ static void _find(Request& r, MethodPara
 
 	// easy way
 	if(file_exist(r.absolute(*file_spec))) {
-		r.write_assign_lang(*file_spec);
+		r.write(*file_spec);
 		return;
 	}
 
@@ -816,7 +817,7 @@ static void _find(Request& r, MethodPara
 		test_name << dirname.mid(0, slash+1);
 		test_name << basename;
 		if(file_exist(r.absolute(test_name))) {
-			r.write_assign_lang(test_name);
+			r.write(test_name);
 			return;
 		}
 		rpos=slash;
@@ -824,7 +825,7 @@ static void _find(Request& r, MethodPara
 
 	// no way, not found
 	if(not_found_code)
-		r.write_pass_lang(r.process(*not_found_code));
+		r.write(r.process(*not_found_code));
 }
 
 static void _dirname(Request& r, MethodParams& params) {
@@ -842,22 +843,22 @@ static void _dirname(Request& r, MethodP
 	// file    > .
 
 	if(file_spec.is_empty()) {
-		r.write_assign_lang(String("."));
+		r.write(String("."));
 		return;
 	}
 
 	size_t p;
 	size_t slash;
 	if((p=file_spec.rskipchars("/\\"))==STRING_NOT_FOUND)
-		r.write_assign_lang(String("/"));
+		r.write(String("/"));
 	else {
 		if((slash=file_spec.strrpbrk("/\\", 0, p))!=STRING_NOT_FOUND) {
 			if((p=file_spec.rskipchars("/\\", 0, slash))==STRING_NOT_FOUND)
 				p=slash;
-			r.write_assign_lang(file_spec.mid(0, p+1));
+			r.write(file_spec.mid(0, p+1));
 			return;
 		}
-		r.write_assign_lang(String("."));
+		r.write(String("."));
 	}
 }
 
@@ -876,15 +877,15 @@ static void _basename(Request& r, Method
 	// file    > file
 
 	if(file_spec.is_empty()) {
-		r.write_assign_lang(String("."));
+		r.write(String("."));
 		return;
 	}
 
 	size_t p=file_spec.rskipchars("/\\");
 	if(p==STRING_NOT_FOUND)
-		r.write_assign_lang(String("/"));
+		r.write(String("/"));
 	else
-		r.write_assign_lang(file_spec.mid(afterlastslash(file_spec, p), p+1));
+		r.write(file_spec.mid(afterlastslash(file_spec, p), p+1));
 }
 
 static void _justname(Request& r, MethodParams& params) {
@@ -894,7 +895,7 @@ static void _justname(Request& r, Method
 	// /a/b.c  > b
 	size_t pos=afterlastslash(file_spec);
 	size_t dotpos=file_spec.strrpbrk(".", pos);
-	r.write_assign_lang(file_spec.mid(pos, dotpos!=STRING_NOT_FOUND?dotpos:file_spec.length()));
+	r.write(file_spec.mid(pos, dotpos!=STRING_NOT_FOUND?dotpos:file_spec.length()));
 }
 
 static void _justext(Request& r, MethodParams& params) {
@@ -904,7 +905,7 @@ static void _justext(Request& r, MethodP
 	size_t pos=afterlastslash(file_spec);
 	size_t dotpos=file_spec.strrpbrk(".", pos);
 	if(dotpos!=STRING_NOT_FOUND)
-		r.write_assign_lang(file_spec.mid(dotpos+1, file_spec.length()));
+		r.write(file_spec.mid(dotpos+1, file_spec.length()));
 }
 
 static void _fullpath(Request& r, MethodParams& params) {
@@ -924,14 +925,14 @@ static void _fullpath(Request& r, Method
 		}
 		result=&full_disk_path.mid(document_root_length,  full_disk_path.length());
 	}
-	r.write_assign_lang(*result);
+	r.write(*result);
 }
 
 static void _sql_string(Request& r, MethodParams&) {
 	VFile& self=GET_SELF(r, VFile);
 
 	const char *quoted=r.connection()->quote(self.value_ptr(), self.value_size());
-	r.write_assign_lang(*new String(quoted));
+	r.write(*new String(quoted));
 }
 
 #ifndef DOXYGEN
@@ -990,9 +991,8 @@ public:
 static void _sql(Request& r, MethodParams& params) {
 	Value& statement=params.as_junction(0, "statement must be code");
 
-	Temp_lang temp_lang(r, String::L_SQL);
 	const String& statement_string=r.process_to_string(statement);
-	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
 
 	File_sql_event_handlers handlers(statement_string, statement_cstr);
 
@@ -1092,13 +1092,13 @@ static void _base64(Request& r, MethodPa
 		} else {
 			// encode: ^f.base64[]
 			const char* encoded=pa_base64_encode(self.value_ptr(), self.value_size());
-			r.write_assign_lang(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed**/));
+			r.write(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed**/));
 		}
 	} else {
 		// encode: ^file:base64[filespec]
 		const String& file_spec=params.as_string(0, FILE_NAME_MUST_BE_STRING);
 		const char* encoded=pa_base64_encode(r.absolute(file_spec));
-		r.write_assign_lang(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed*/));
+		r.write(*new String(encoded, String::L_TAINTED/*once ?param=base64(something) was needed*/));
 	}
 }
 
@@ -1117,7 +1117,7 @@ static void _crc32(Request& r, MethodPar
 		VFile& self=GET_SELF(r, VFile);
 		crc32=pa_crc32(self.value_ptr(), self.value_size());
 	}
-	r.write_no_lang(*new VInt(crc32));
+	r.write(*new VInt(crc32));
 }
 
 
@@ -1174,7 +1174,7 @@ static void _md5(Request& r, MethodParam
 		md5=pa_md5(self.value_ptr(), self.value_size());
 
 	}
-	r.write_no_lang(*new String(md5));
+	r.write(*new String(md5));
 }
 
 // constructor