--- parser3/src/classes/file.C	2013/03/09 05:38:33	1.223
+++ parser3/src/classes/file.C	2015/04/02 22:04:40	1.233
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.223 2013/03/09 05:38:33 misha Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.233 2015/04/02 22:04:40 moko Exp $";
 
 // defines
 
@@ -33,12 +33,30 @@ volatile const char * IDENT_FILE_C="$Id:
 #define CHARSET_EXEC_PARAM_NAME "charset"
 
 #define NAME_NAME "name"
+#define KEEP_EMPTY_DIRS_NAME "keep-empty-dirs"
+#define SUPPRESS_EXCEPTION_NAME "exception"
 
 // externs
 
 extern String sql_limit_name;
 extern String sql_offset_name;
 
+// helpers
+
+class File_list_table_template_columns: public ArrayString {
+public:
+	File_list_table_template_columns() {
+		*this+=new String("name");
+		*this+=new String("dir");
+		*this+=new String("size");
+		*this+=new String("cdate");
+		*this+=new String("mdate");
+		*this+=new String("adate");
+	}
+};
+
+Table file_list_table_template(new File_list_table_template_columns);
+
 // class
 
 class MFile: public Methoded {
@@ -128,19 +146,49 @@ static void _save(Request& r, MethodPara
 
 static void _delete(Request& r, MethodParams& params) {
 	const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	bool keep_empty_dirs=false;
+	bool fail_on_problem=true;
+
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1)){
+			int valid_options=0;
+			if(Value* vkeep_empty_dirs=options->get(KEEP_EMPTY_DIRS_NAME)){
+				keep_empty_dirs=r.process_to_value(*vkeep_empty_dirs).as_bool();
+				valid_options++;
+			}
+			if(Value* vsuppress_exception=options->get(SUPPRESS_EXCEPTION_NAME)){
+				fail_on_problem=r.process_to_value(*vsuppress_exception).as_bool();
+				valid_options++;
+			}
+			if(valid_options != options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	// unlink
-	file_delete(r.absolute(file_name));
+	file_delete(r.absolute(file_name), fail_on_problem, keep_empty_dirs);
 }
 
 static void _move(Request& r, MethodParams& params) {
 	Value& vfrom_file_name=params.as_no_junction(0, "from file name must not be code");
 	Value& vto_file_name=params.as_no_junction(1, "to file name must not be code");
+	bool keep_empty_dirs=false;
+
+	if(params.count()>2)
+		if(HashStringValue* options=params.as_hash(2)){
+			int valid_options=0;
+			if(Value* vkeep_empty_dirs=options->get(KEEP_EMPTY_DIRS_NAME)){
+				keep_empty_dirs=r.process_to_value(*vkeep_empty_dirs).as_bool();
+				valid_options++;
+			}
+			if(valid_options != options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	// move
 	file_move(
 		r.absolute(vfrom_file_name.as_string()),
-		r.absolute(vto_file_name.as_string()));
+		r.absolute(vto_file_name.as_string()),
+		keep_empty_dirs);
 }
 
 static void copy_process_source(
@@ -306,14 +354,14 @@ static void _create(Request& r, MethodPa
 	VFile& self=GET_SELF(r, VFile);
 
 	if(const String* content_str=vcontent.get_string()){
-		String::Body body=content_str->cstr_to_string_body_untaint(String::L_AS_IS); // explode content, honor tainting changes
+		String::Body body=content_str->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets); // explode content, honor tainting changes
 		if(asked_charset && is_text)
 			body=Charset::transcode(body, r.charsets.source(), *asked_charset);
 		self.set(true/*tainted*/, is_text, body.cstrm(), body.length(), file_name, vcontent_type, &r);
 	} else {
 		if(asked_charset)
 			throw Exception(PARSER_RUNTIME, 0, "charset option can not be used with file-content");
-		self.set(*vcontent.as_vfile(String::L_AS_IS), is_text, file_name, vcontent_type, &r);
+		self.set(*vcontent.as_vfile(String::L_AS_IS), mode != 0, is_text, file_name, vcontent_type, &r);
 	}
 
 }
@@ -402,7 +450,7 @@ static void pass_cgi_header_attribute(
 
 static void append_to_argv(Request& r, ArrayString& argv, const String* str){
 	if(!str->is_empty())
-		argv+=new String(str->cstr_to_string_body_untaint(String::L_AS_IS, 0, &r.charsets), String::L_AS_IS);
+		argv+=new String(str->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets), String::L_AS_IS);
 }
 
 /// @todo fix `` in perl - they produced flipping consoles and no output to perl
@@ -426,19 +474,16 @@ static void _exec_cgi(Request& r, Method
 			env.put( \
 				String::Body(#name), \
 				String::Body(*value_cstr?value_cstr:0)); \
-	// passing SAPI::environment
-	if(const char *const *pairs=SAPI::environment(r.sapi_info)) {
-		while(const char* pair=*pairs++)
-			if(const char* eq_at=strchr(pair, '='))
-				if(eq_at[1]) // has value
-					env.put(
-						pa_strdup(pair, eq_at-pair),
-						pa_strdup(eq_at+1));
-	}
+	// passing environment
+	for(SAPI::Env::Iterator i(r.sapi_info); i; i.next() )
+		env.put(
+			i.key(),
+			i.value()
+		);
 
 	// const
 	ECSTR(GATEWAY_INTERFACE, "CGI/1.1");
-	ECSTR("PARSER_VERSION", PARSER_VERSION);
+	ECSTR(PARSER_VERSION, PARSER_VERSION);
 	// from Request.info
 	ECSTR(DOCUMENT_ROOT, r.request_info.document_root);
 	ECSTR(PATH_TRANSLATED, r.request_info.path_translated);
@@ -473,7 +518,7 @@ 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), String::L_AS_IS);
+					in = new String(sstdin->cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false), &r.charsets), String::L_AS_IS);
 				} 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);
@@ -635,26 +680,48 @@ static void _cgi(Request& r, MethodParam
 static void _list(Request& r, MethodParams& params) {
 	Value& relative_path=params.as_no_junction(0, "path must not be code");
 
+	bool stat=false;
 	VRegex* vregex=0;
 	VRegexCleaner vrcleaner;
+
 	if(params.count()>1){
-		Value& regexp=params.as_no_junction(1, "regexp must not be code");
-		if(regexp.is_defined()){
-			if(Value* value=regexp.as(VREGEX_TYPE)){
-				vregex=static_cast<VRegex*>(value);
+		Value& voption=params.as_no_junction(1, "option must not be code");
+		if(voption.is_defined()) {
+			Value* vfilter=0;
+			if(HashStringValue* options=voption.get_hash()) {
+				int valid_options=0;
+				if(Value* vstat=options->get("stat")) {
+					stat=r.process_to_value(*vstat).as_bool();
+					valid_options++;
+				}
+				if(Value* value=options->get("filter")) {
+					vfilter=value;
+					valid_options++;
+				}
+				if(valid_options!=options->count())
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else {
-				vregex=new VRegex(r.charsets.source(), &regexp.as_string(), 0/*options*/);
+				vfilter=&voption;
+			}
+			if(vfilter)
+				if(Value* value=vfilter->as(VREGEX_TYPE)) {
+					vregex=static_cast<VRegex*>(value);
+				} else if(vfilter->is_string()) {
+					if(!vfilter->get_string()->trim().is_empty()) {
+						vregex=new VRegex(r.charsets.source(), &vfilter->as_string(), 0/*options*/);
 				vregex->study();
 				vrcleaner.vregex=vregex;
 			}
+				} else {
+					throw Exception(PARSER_RUNTIME, 0, "filter must be regex or string");
+				}
 		}
 	}
 
 	const char* absolute_path_cstr=r.absolute(relative_path.as_string()).taint_cstr(String::L_FILE_SPEC);
 
-	Table::columns_type columns(new ArrayString);
-	*columns+=new String("name");
-	Table& table=*new Table(columns);
+	Table::Action_options table_options;
+	Table& table=*new Table(file_list_table_template, table_options);
 
 	const int ovector_size=(1/*match*/)*3;
 	int ovector[ovector_size];
@@ -666,6 +733,14 @@ static void _list(Request& r, MethodPara
 		if(!vregex || vregex->exec(ffblk.ff_name, file_name_size, ovector, ovector_size)>=0) {
 			Table::element_type row(new ArrayString);
 			*row+=new String(pa_strdup(file_name_cstr, file_name_size), String::L_TAINTED);
+			*row+=new String(String::Body::Format(ffblk.is_dir() ? 1 : 0), String::L_CLEAN);
+			if(stat) {
+				ffblk.stat_file();
+				*row+=VDouble(ffblk.size()).get_string();
+				*row+=new String(String::Body::Format((int)ffblk.c_timestamp()), String::L_CLEAN);
+				*row+=new String(String::Body::Format((int)ffblk.m_timestamp()), String::L_CLEAN);
+				*row+=new String(String::Body::Format((int)ffblk.a_timestamp()), String::L_CLEAN);
+			}
 			table+=row;
 		}
 	);
@@ -1119,10 +1194,12 @@ MFile::MFile(): Methoded("file") {
 	add_native_method("save", Method::CT_DYNAMIC, _save, 2, 3);
 
 	// ^file:delete[file-name]
-	add_native_method("delete", Method::CT_STATIC, _delete, 1, 1);
+	// ^file:delete[file-name;$.keep-empty-dir(true)$.exception(false)]
+	add_native_method("delete", Method::CT_STATIC, _delete, 1, 2);
 
 	// ^file:move[from-file-name;to-file-name]
-	add_native_method("move", Method::CT_STATIC, _move, 2, 2);
+	// ^file:move[from-file-name;to-file-name;$.keep-empty-dir(true)]
+	add_native_method("move", Method::CT_STATIC, _move, 2, 3);
 
 	// ^file::load[mode;disk-name]
 	// ^file::load[mode;disk-name;user-name]
@@ -1145,6 +1222,7 @@ MFile::MFile(): Methoded("file") {
 
 	// ^file:list[path]
 	// ^file:list[path][regexp]
+	// ^file:list[path][$.filter[regexp] $.stat(true)]
 	add_native_method("list", Method::CT_STATIC, _list, 1, 2);
 
 	// ^file:lock[path]{code}