--- parser3/src/classes/file.C	2016/12/28 17:41:15	1.259
+++ parser3/src/classes/file.C	2017/05/17 14:22:11	1.263
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b file parser class.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 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.259 2016/12/28 17:41:15 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.263 2017/05/17 14:22:11 moko Exp $";
 
 // defines
 
@@ -192,7 +192,7 @@ static void _move(Request& r, MethodPara
 		keep_empty_dirs);
 }
 
-static void copy_process_source(struct stat& , int from_file, const String&, 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;
@@ -730,10 +730,10 @@ static void _list(Request& r, MethodPara
 	int ovector[ovector_size];
 
 	LOAD_DIR(absolute_path_cstr, 
-		const char* file_name_cstr=ffblk.ff_name;
+		const char* file_name_cstr=ffblk.name();
 		size_t file_name_size=strlen(file_name_cstr);
 
-		if(!vregex || vregex->exec(ffblk.ff_name, file_name_size, ovector, ovector_size)>=0) {
+		if(!vregex || vregex->exec(file_name_cstr, 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);
@@ -984,7 +984,7 @@ public:
 			}
 			return false;
 		} catch(...) {
-			error=SQL_Error("exception occured in File_sql_event_handlers::add_row_cell");
+			error=SQL_Error("exception occurred in File_sql_event_handlers::add_row_cell");
 			return true;
 		}
 	}