--- parser3/src/classes/file.C	2008/07/23 14:07:43	1.174
+++ parser3/src/classes/file.C	2008/09/03 15:15:32	1.178
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_FILE_C="$Date: 2008/07/23 14:07:43 $";
+static const char * const IDENT_FILE_C="$Date: 2008/09/03 15:15:32 $";
 
 #include "pa_config_includes.h"
 
@@ -608,21 +608,25 @@ static void _list(Request& r, MethodPara
 	Value& relative_path=params.as_no_junction(0, "path must not be code");
 
 	const String* regexp;
-	PCRE::pcre *regexp_code;
+	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();
+		const char* pattern=regexp->cstr(String::L_UNSPECIFIED);
 		const char* errptr;
 		int erroffset;
-		regexp_code=PCRE::pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
+		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(0, 
+			throw Exception(PCRE_EXCEPTION_TYPE, 
 				&regexp->mid(erroffset, regexp->length()), 
 				"regular expression syntax error - %s", errptr);
 	} else {
@@ -642,17 +646,17 @@ static void _list(Request& r, MethodPara
 		size_t file_name_size=strlen(file_name_cstr);
 		bool suits=true;
 		if(regexp_code) {
-			int exec_result=PCRE::pcre_exec(regexp_code, 0, 
+			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::pcre_free)(regexp_code);
-				throw Exception(0, 
-					regexp, 
-					"regular expression execute (%d)", 
+				(*pcre_free)(regexp_code);
+				throw Exception(PCRE_EXCEPTION_TYPE, 
+					regexp,
+					print_pcre_exec_error_text(exec_result),
 						exec_result);
 			}
 		}
@@ -665,7 +669,7 @@ static void _list(Request& r, MethodPara
 	);
 
 	if(regexp_code)
-		PCRE::pcre_free(regexp_code);
+		pcre_free(regexp_code);
 
 	// write out result
 	r.write_no_lang(*new VTable(&table));