--- parser3/src/classes/file.C	2009/01/12 07:46:13	1.181
+++ parser3/src/classes/file.C	2009/04/22 04:41:32	1.185
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b file parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_FILE_C="$Date: 2009/01/12 07:46:13 $";
+static const char * const IDENT_FILE_C="$Date: 2009/04/22 04:41:32 $";
 
 #include "pa_config_includes.h"
 
@@ -24,6 +24,7 @@ static const char * const IDENT_FILE_C="
 #include "pa_charsets.h"
 #include "pa_sql_connection.h"
 #include "pa_md5.h"
+#include "pa_vregex.h"
 
 // defines
 
@@ -203,14 +204,27 @@ static void _load(Request& r, MethodPara
 	const String& lfile_name=r.absolute(params.as_no_junction(1, FILE_NAME_MUST_NOT_BE_CODE).as_string());
 
 	size_t param_index=params.count()-1;
-	Value* param_value=param_index>=2?&params.as_no_junction(param_index, "filename or options must not be code"):0;
-	HashStringValue* param_hash=param_value?param_value->get_hash():0;
-	HashStringValue* options=param_hash;
+	Value* param_value=param_index>1?&params.as_no_junction(param_index, "filename or options must not be code"):0;
 
-	param_index--;
+	HashStringValue* options=0;
+	const char *user_file_name=0;
+
+	if(param_value){
+		options=param_value->get_hash();
+		if(options || param_index>2)
+			param_index--;
+		if(param_index>1){
+			const String& luser_file_name=params.as_string(param_index, FILE_NAME_MUST_BE_STRING);
+			if(!luser_file_name.is_empty())
+				user_file_name=luser_file_name.cstr(String::L_FILE_SPEC);
+		}
+	}
+	if(!user_file_name)
+		user_file_name=lfile_name.cstr(String::L_FILE_SPEC);
 
 	size_t offset=0;
 	size_t limit=0;
+
 	if(options){
 		options=new HashStringValue(*options);
 		if(Value *voffset=(Value *)options->get(sql_offset_name)){
@@ -221,14 +235,10 @@ static void _load(Request& r, MethodPara
 		}
 		// no check on options count here, see file_read
 	}
-	File_read_result file=file_read(r.charsets, lfile_name,
+	File_read_result file=file_load(r, lfile_name,
 		as_text, options, true, 0, offset, limit
 	);
 
-	const char *user_file_name=(param_index>=2)?
-				params.as_string(param_index, FILE_NAME_MUST_BE_STRING).cstr(String::L_FILE_SPEC)
-				:lfile_name.cstr(String::L_FILE_SPEC);
-
 	Value* vcontent_type=0;
 	if(file.headers){
 		if(Value* remote_content_type=file.headers->get(HTTP_CONTENT_TYPE_UPPER))
@@ -607,70 +617,41 @@ 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");
 
-	const String* regexp;
-	pcre *regexp_code;
-	const int ovecsize=(1/*match*/)*3;
-	int ovector[ovecsize];
-	if(params.count()>1) {
-		regexp=&params.as_no_junction(1, "regexp must not be code").as_string();
-
-		const char* pattern=regexp->cstr(String::L_UNSPECIFIED);
-		const char* errptr;
-		int erroffset;
-		int options=PCRE_EXTRA | PCRE_DOTALL;
-		if(r.charsets.source().isUTF8())
-			options=options|PCRE_UTF8;
-
-		regexp_code=pcre_compile(pattern, options, 
-			&errptr, &erroffset, 
-			r.charsets.source().pcre_tables);
-
-		if(!regexp_code)
-			throw Exception(PCRE_EXCEPTION_TYPE, 
-				&regexp->mid(erroffset, regexp->length()), 
-				"regular expression syntax error - %s", errptr);
+	VRegex* vregex;
+	VRegexCleaner vrcleaner;
+	if(params.count()>1){
+		Value& regexp=params.as_no_junction(1, "regexp must not be code");
+		if(Value* value=regexp.as(VREGEX_TYPE, false)){
+			vregex=static_cast<VRegex*>(value);
+		} else {
+			vregex=new VRegex(r.charsets.source(), &regexp.as_string(), 0/*options*/);
+			vrcleaner.vregex=vregex;
+		}
+		vregex->study();
 	} else {
-		regexp=0; // not used, just to calm down compiler
-		regexp_code=0;
+		vregex=0;
 	}
 
-
 	const char* absolute_path_cstr=r.absolute(relative_path.as_string()).cstr(String::L_FILE_SPEC);
 
 	Table::columns_type columns(new ArrayString);
 	*columns+=new String("name");
 	Table& table=*new Table(columns);
 
+	const int ovector_size=(1/*match*/)*3;
+	int ovector[ovector_size];
+
 	LOAD_DIR(absolute_path_cstr, 
 		const char* file_name_cstr=ffblk.ff_name;
 		size_t file_name_size=strlen(file_name_cstr);
-		bool suits=true;
-		if(regexp_code) {
-			int exec_result=pcre_exec(regexp_code, 0, 
-				ffblk.ff_name, file_name_size, 0, 
-				0, ovector, ovecsize);
-			
-			if(exec_result==PCRE_ERROR_NOMATCH)
-				suits=false;
-			else if(exec_result<0) {
-				(*pcre_free)(regexp_code);
-				throw Exception(PCRE_EXCEPTION_TYPE, 
-					regexp,
-					print_pcre_exec_error_text(exec_result),
-						exec_result);
-			}
-		}
 
-		if(suits) {
+		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), file_name_size, true);
+			*row+=new String(pa_strdup(file_name_cstr, file_name_size), file_name_size, true/*tainted*/);
 			table+=row;
 		}
 	);
 
-	if(regexp_code)
-		pcre_free(regexp_code);
-
 	// write out result
 	r.write_no_lang(*new VTable(&table));
 }