--- parser3/src/classes/file.C	2001/07/24 09:45:27	1.45
+++ parser3/src/classes/file.C	2001/10/29 13:04:45	1.61
@@ -2,12 +2,14 @@
 	Parser: @b file parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: file.C,v 1.45 2001/07/24 09:45:27 parser Exp $
+	$Id: file.C,v 1.61 2001/10/29 13:04:45 paf Exp $
 */
-static const char *RCSId="$Id: file.C,v 1.45 2001/07/24 09:45:27 parser Exp $"; 
+
+#include "pa_config_includes.h"
+
+#include "pcre.h"
 
 #include "classes.h"
 #include "pa_request.h"
@@ -16,6 +18,8 @@ static const char *RCSId="$Id: file.C,v
 #include "pa_vint.h"
 #include "pa_exec.h"
 #include "pa_vdate.h"
+#include "pa_dir.h"
+#include "pa_vtable.h"
 
 // consts
 
@@ -23,6 +27,8 @@ static const char *RCSId="$Id: file.C,v
 
 #define FILE_CLASS_NAME "file"
 
+#define TEXT_MODE_NAME "text"
+
 // class
 
 class MFile : public Methoded {
@@ -45,10 +51,12 @@ const int FIND_MONKEY_MAX_HOPS=10;
 // methods
 
 static void _save(Request& r, const String&, MethodParams *params) {
-	Value& vfile_name=params->as_no_junction(0, "file name must not be code");
+	Value& vmode_name=params-> as_no_junction(0, "mode must not be code");
+	Value& vfile_name=params->as_no_junction(1, "file name must not be code");
 
 	// save
-	static_cast<VFile *>(r.self)->save(r.absolute(vfile_name.as_string()));
+	static_cast<VFile *>(r.self)->save(r.absolute(vfile_name.as_string()),
+		vmode_name.as_string()==TEXT_MODE_NAME);
 }
 
 static void _delete(Request& r, const String&, MethodParams *params) {
@@ -64,7 +72,7 @@ static void _move(Request& r, const Stri
 	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");
 
-	// unlink
+	// move
 	file_move(pool, 
 		r.absolute(vfrom_file_name.as_string()),
 		r.absolute(vto_file_name.as_string()));
@@ -103,18 +111,21 @@ static void _find(Request& r, const Stri
 
 static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Value& vfile_name=params->as_no_junction(0, "file name must not be code");
+	Value& vmode_name=params-> as_no_junction(0, "mode must not be code");
+	Value& vfile_name=params->as_no_junction(1, "file name must not be code");
 
 	const String& lfile_name=vfile_name.as_string();
 
 	void *data;  size_t size;
-	file_read(pool, r.absolute(lfile_name), data, size, false/*binary*/);
+	file_read(pool, r.absolute(lfile_name), data, size, 
+		vmode_name.as_string()==TEXT_MODE_NAME);
 
-	char *user_file_name=params->size()==1?lfile_name.cstr(String::UL_FILE_NAME)
-		:params->get(1).as_string().cstr();
+	char *user_file_name=params->size()>2?
+		params->as_string(2, "filename must be string").cstr(String::UL_FILE_SPEC)
+		:lfile_name.cstr(String::UL_FILE_SPEC);
 	
 	static_cast<VFile *>(r.self)->set(true/*tainted*/, data, size, 
-		user_file_name, &r.mime_type_of(user_file_name));
+		user_file_name, new(pool) VString(r.mime_type_of(user_file_name)));
 }
 
 static void _stat(Request& r, const String& method_name, MethodParams *params) {
@@ -205,7 +216,7 @@ static void _exec_cgi(Request& r, const
 
 	if(params->size()>1) {
 		Value& venv=params->as_no_junction(1, "env must not be code");
-		if(Hash *user_env=venv.get_hash())
+		if(Hash *user_env=venv.get_hash(&method_name))
 			user_env->for_each(append_env_pair, &env);
 	}
 
@@ -213,10 +224,11 @@ static void _exec_cgi(Request& r, const
 	if(params->size()>2) {
 		argv=new(pool) Array(pool, params->size()-2);
 		for(int i=2; i<params->size(); i++)
-			*argv+=&params->get(i).as_string();
+			*argv+=&params->as_string(i, "parameter must be string");
 	}
 
-	const String in(pool, r.post_data, r.post_size);
+	String in(pool);
+	in.APPEND(r.post_data, r.post_size, String::UL_CLEAN, "passing post data", 0);
 	String out(pool);
 	//out.APPEND_CONST("content-type:text/plain\nheader:test-header\n\ntest-body");
 	//out<<in;
@@ -237,10 +249,12 @@ static void _exec_cgi(Request& r, const
 		}
 		if(pos<0) {
 			delim_size=0; // calm down, compiler
-			PTHROW(0, 0,
+			throw Exception(0, 0,
 				&method_name,
-				"output does not contain CGI header; exit code=%d; size=%u; text: \"%s\"", 
-					status, (uint)out.size(), out.cstr());
+				"output does not contain CGI header; exit code=%d; outsize=%u; out: \"%s\"; errsize=%u; err: \"%s\"", 
+					status, 
+					(uint)out.size(), out.cstr(),
+					(uint)err.size(), err.cstr());
 		}
 
 		const String& header=out.mid(0, pos);
@@ -277,6 +291,82 @@ static void _cgi(Request& r, const Strin
 	_exec_cgi(r, method_name, params, true);
 }
 
+static void _list(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	Value& relative_path=params->as_no_junction(0, "path must not be code");
+
+	const String *regexp;
+	pcre *regexp_code;
+	int ovecsize;
+	int *ovector;
+	if(params->size()>1) {
+		regexp=&params->as_no_junction(1, "regexp must not be code").as_string();
+
+		const char *pattern=regexp->cstr(String::UL_AS_IS);
+		const char *errptr;
+		int erroffset;
+		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
+			&errptr, &erroffset, 
+			r.pcre_tables());
+
+		if(!regexp_code)
+			throw Exception(0, 0, 
+				&regexp->mid(erroffset, regexp->size()), 
+				"regular expression syntax error - %s", errptr);
+
+		ovector=(int *)pool.malloc(sizeof(int)*(ovecsize=(1/*match*/)*3));
+	} else 
+		regexp_code=0;
+
+
+	const char* absolute_path_cstr=r.absolute(relative_path.as_string())
+		.cstr(String::UL_FILE_SPEC);
+
+	Array& columns=*new(pool) Array(pool);
+	columns+=new(pool) String(pool, "name");	
+	Table& table=*new(pool) Table(pool, &method_name, &columns);
+
+	LOAD_DIR(absolute_path_cstr, 
+		size_t file_name_size=strlen(ffblk.ff_name);
+		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(0, 0, 
+					regexp, 
+					"regular expression execute (%d)", 
+						exec_result);
+			}
+		}
+
+		if(suits) {
+			char *file_name_cstr=(char *)pool.malloc(file_name_size);
+			memcpy(file_name_cstr, ffblk.ff_name, file_name_size);
+			String &file_name=*new(pool) String(pool);
+			file_name.APPEND(file_name_cstr, file_name_size, String::UL_FILE_SPEC, 
+				method_name.origin().file, method_name.origin().line);
+		
+			Array& row=*new(pool) Array(pool);
+			row+=&file_name;
+			table+=&row;
+		}
+	);
+
+	if(regexp_code)
+		(*pcre_free)(regexp_code);
+
+	// write out result
+	VTable& result=*new(pool) VTable(pool, &table);
+	result.set_name(method_name);
+	r.write_no_lang(result);
+}
 
 // constructor
 
@@ -284,8 +374,8 @@ MFile::MFile(Pool& apool) : Methoded(apo
 	set_name(*NEW String(pool(), FILE_CLASS_NAME));
 
 
-	// ^save[file-name]
-	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1);
+	// ^save[mode;file-name]
+	add_native_method("save", Method::CT_DYNAMIC, _save, 2, 2);
 
 	// ^delete[file-name]
 	add_native_method("delete", Method::CT_STATIC, _delete, 1, 1);
@@ -297,9 +387,9 @@ MFile::MFile(Pool& apool) : Methoded(apo
 	// ^find[file-name]{when-not-found}
 	add_native_method("find", Method::CT_STATIC, _find, 1, 2);
 
-	// ^load[disk-name]
-	// ^load[disk-name;user-name]
-	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
+	// ^load[mode;disk-name]
+	// ^load[mode;disk-name;user-name]
+	add_native_method("load", Method::CT_DYNAMIC, _load, 2, 3);
 
 	// ^stat[disk-name]
 	add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1);
@@ -313,6 +403,11 @@ MFile::MFile(Pool& apool) : Methoded(apo
 	// ^exec[file-name;env hash]
 	// ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s]
 	add_native_method("exec", Method::CT_DYNAMIC, _exec, 1, 2+10);
+
+	// ^file:list[path]
+	// ^file:list[path][regexp]
+	add_native_method("list", Method::CT_STATIC, _list, 1, 2);
+
 }
 
 // global variable