--- parser3/src/classes/file.C	2016/08/02 14:36:48	1.246
+++ parser3/src/classes/file.C	2016/09/21 15:35:10	1.251
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.246 2016/08/02 14:36:48 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.251 2016/09/21 15:35:10 moko Exp $";
 
 // defines
 
@@ -133,7 +133,7 @@ static void _save(Request& r, MethodPara
 		if(HashStringValue* options=params.as_hash(2)){
 			int valid_options=0;
 			if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){
-				asked_charset=&::charsets.get(vcharset_name->as_string());
+				asked_charset=&pa_charsets.get(vcharset_name->as_string());
 				valid_options++;
 			}
 			if(valid_options != options->count())
@@ -335,17 +335,17 @@ static void _create(Request& r, MethodPa
 				}
 			}
 			if(Value* vcharset_name=options->get("to-charset")) {
-				to_charset=&::charsets.get(vcharset_name->as_string());
+				to_charset=&pa_charsets.get(vcharset_name->as_string());
 				valid_options++;
 			}
 			if(Value* vcharset_name=options->get("from-charset")) {
-				from_charset=&::charsets.get(vcharset_name->as_string());
+				from_charset=&pa_charsets.get(vcharset_name->as_string());
 				valid_options++;
 			}
 			if(Value* vcharset_name=options->get(PA_CHARSET_NAME)) {
 				if(to_charset)
 					throw Exception(PARSER_RUNTIME, 0, "charset option can not be used with to-charset");
-				to_charset=&::charsets.get(vcharset_name->as_string());
+				to_charset=&pa_charsets.get(vcharset_name->as_string());
 				valid_options++;
 			}
 			if(Value* value=options->get(CONTENT_TYPE_NAME)) {
@@ -365,9 +365,14 @@ static void _create(Request& r, MethodPa
 		self.set(true/*tainted*/, is_text, body.cstrm(), body.length(), file_name, vcontent_type, &r);
 	} else {
 		VFile& fcontent=*vcontent.as_vfile(String::L_AS_IS); // can't be null
-		self.set(fcontent, mode != 0, is_text, file_name, vcontent_type, &r);
-		if(is_text && !fcontent.is_text_mode())
-			from_charset=self.detect_binary_charset(from_charset);
+		if(mode){
+			self.set(fcontent, &is_text, file_name, vcontent_type, &r);
+			if(is_text && !fcontent.is_text_mode())
+				from_charset=self.detect_binary_charset(from_charset);
+		} else {
+			self.set(fcontent, 0, file_name, vcontent_type, &r);
+			is_text=fcontent.is_text_mode();
+		}
 	}
 
 	if(to_charset || from_charset)
@@ -504,7 +509,7 @@ static void _exec_cgi(Request& r, Method
 		if(HashStringValue* user_env=params.as_hash(param_index++, "env")) {
 			// $.charset  [previewing to handle URI pieces]
 			if(Value* vcharset=user_env->get(CHARSET_EXEC_PARAM_NAME))
-				charset=&charsets.get(vcharset->as_string());
+				charset=&pa_charsets.get(vcharset->as_string());
 
 			// $.others
 			Append_env_pair_info info={&r.charsets, &env, 0};
@@ -544,13 +549,10 @@ static void _exec_cgi(Request& r, Method
 				} else {
 					Table* table=param.get_table();
 					if(table){
-						for(size_t i=0; i<table->count(); i++) {
-							append_to_argv(r, argv, table->get(i)->get(0));
-						}
+						for(size_t j=0; j<table->count(); j++)
+							append_to_argv(r, argv, table->get(j)->get(0));
 					} else {
-						throw Exception(PARSER_RUNTIME,
-							0,
-							"param must be string or table");
+						throw Exception(PARSER_RUNTIME, 0, "param must be string or table");
 					}
 				}
 			}
@@ -647,8 +649,7 @@ static void _exec_cgi(Request& r, Method
 		// $fields << header
 		if(header) {
 			ArrayString rows;
-			size_t pos_after=0;
-			header->split(rows, pos_after, eol_marker);
+			header->split(rows, 0, eol_marker);
 			Pass_cgi_header_attribute_info info={0, 0, 0};
 			info.charset=&r.charsets.source();
 			info.fields=&self.fields();