--- parser3/src/classes/file.C	2013/03/14 02:50:58	1.225
+++ parser3/src/classes/file.C	2016/07/21 18:30:10	1.243
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b file parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.225 2013/03/14 02:50:58 misha Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.243 2016/07/21 18:30:10 moko Exp $";
 
 // defines
 
@@ -41,6 +41,22 @@ volatile const char * IDENT_FILE_C="$Id:
 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 {
@@ -52,7 +68,7 @@ public:
 
 // global variable
 
-DECLARE_CLASS_VAR(file, new MFile, 0);
+DECLARE_CLASS_VAR(file, new MFile);
 
 // consts
 
@@ -175,11 +191,7 @@ static void _move(Request& r, MethodPara
 		keep_empty_dirs);
 }
 
-static void copy_process_source(
-				struct stat& , 
-				int from_file, 
-				const String& , const char* /*fname*/, bool, 
-				void *context) {
+static void copy_process_source(struct stat& , int from_file, const String&, void *context) {
 	int& to_file=*static_cast<int *>(context);
 
 	int nCount=0;
@@ -198,7 +210,7 @@ static void copy_process_source(
 static void copy_open_target(int f, void *from_spec) {
 	String& file_spec=*static_cast<String *>(from_spec);
 	file_read_action_under_lock(file_spec, "copy", copy_process_source, &f);
-};
+}
 
 static void _copy(Request& r, MethodParams& params) {
 	Value& vfrom_file_name=params.as_no_junction(0, "from file name must not be code");
@@ -279,9 +291,9 @@ static void _load(Request& r, MethodPara
 		file_stat(lfile_name, size, atime, mtime, ctime);
 	
 		HashStringValue& ff=self.fields();
-		ff.put(adate_name, new VDate(atime));
-		ff.put(mdate_name, new VDate(mtime));
-		ff.put(cdate_name, new VDate(ctime));
+		ff.put(adate_name, new VDate((pa_time_t)atime));
+		ff.put(mdate_name, new VDate((pa_time_t)mtime));
+		ff.put(cdate_name, new VDate((pa_time_t)ctime));
 	}
 }
 
@@ -338,14 +350,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);
 	}
 
 }
@@ -363,15 +375,15 @@ static void _stat(Request& r, MethodPara
 
 	self.set_binary(true/*tainted*/, 0/*no bytes*/, size, &lfile_name, 0, &r);
 	HashStringValue& ff=self.fields();
-	ff.put(adate_name, new VDate(atime));
-	ff.put(mdate_name, new VDate(mtime));
-	ff.put(cdate_name, new VDate(ctime));
+	ff.put(adate_name, new VDate((pa_time_t)atime));
+	ff.put(mdate_name, new VDate((pa_time_t)mtime));
+	ff.put(cdate_name, new VDate((pa_time_t)ctime));
 }
 
 static bool is_safe_env_key(const char* key) {
 	for(const char* validator=key; *validator; validator++) {
 		char c=*validator;
-		if(!(c>='A' && c<='Z' || c>='0' && c<='9' || c=='_' || c=='-'))
+		if(!( (c>='A' && c<='Z') || (c>='0' && c<='9') || (c=='_' || c=='-') ))
 			return false;
 	}
 #ifdef PA_SAFE_MODE
@@ -434,7 +446,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
@@ -453,24 +465,14 @@ static void _exec_cgi(Request& r, Method
 	const String& script_name=r.absolute(params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE));
 
 	HashStringString env;
-	#define ECSTR(name, value_cstr) \
-		if(value_cstr) \
-			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));
-	}
+	#define ECSTR(name, value_cstr) if(value_cstr) env.put(#name, value_cstr);
+	// 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);
@@ -480,8 +482,7 @@ static void _exec_cgi(Request& r, Method
 	ECSTR(CONTENT_TYPE, r.request_info.content_type);
 	ECSTR(CONTENT_LENGTH, format(r.request_info.content_length, "%u"));
 	// SCRIPT_*
-	env.put(String::Body("SCRIPT_NAME"), script_name);
-	//env.put(String::Body("SCRIPT_FILENAME"), ??&script_name);
+	env.put("SCRIPT_NAME", script_name);
 
 	// environment & stdin from param
 	String *in=new String();
@@ -505,7 +506,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);
@@ -653,9 +654,7 @@ static void _exec_cgi(Request& r, Method
 	
 	// $stderr
 	if(!real_err->is_empty())
-		self.fields().put(
-			String::Body("stderr"),
-			new VString(*real_err));
+		self.fields().put("stderr", new VString(*real_err));
 }
 static void _exec(Request& r, MethodParams& params) {
 	_exec_cgi(r, params, false);
@@ -667,26 +666,49 @@ 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*/);
-				vregex->study();
-				vrcleaner.vregex=vregex;
+				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];
@@ -698,6 +720,13 @@ 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(stat) ? 1 : 0), String::L_CLEAN);
+			if(stat) {
+				*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;
 		}
 	);
@@ -712,11 +741,13 @@ struct Lock_execute_body_info {
 	Value* body_code;
 };
 #endif
+
 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));
-};
+}
+
 static void _lock(Request& r, MethodParams& params) {
 	const String& file_spec=r.absolute(params.as_string(0, FILE_NAME_MUST_BE_STRING));
 	Lock_execute_body_info info={
@@ -986,10 +1017,8 @@ static void _sql(Request& r, MethodParam
 		handlers,
 		statement_string);
 
-	if(!handlers.value)
-		throw Exception(PARSER_RUNTIME,
-			0,
-			"produced no result");
+	if(!handlers.value.str)
+		throw Exception(PARSER_RUNTIME, 0, "produced no result");
 
 	VFile& self=GET_SELF(r, VFile);
 
@@ -1079,11 +1108,7 @@ static void _crc32(Request& r, MethodPar
 }
 
 
-static void file_md5_file_action(
-				struct stat& finfo, 
-				int f, 
-				const String& , const char* /*fname*/, bool, 
-				void *context)
+static void file_md5_file_action(struct stat& finfo, int f, const String&, void *context)
 {
 	PA_MD5_CTX& md5context=*static_cast<PA_MD5_CTX *>(context);
 	if(finfo.st_size) {
@@ -1179,6 +1204,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}