--- parser3/src/classes/file.C	2001/08/21 11:12:20	1.47
+++ parser3/src/classes/file.C	2001/10/08 14:09:18	1.57
@@ -2,12 +2,10 @@
 	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.47 2001/08/21 11:12:20 parser Exp $
+	$Id: file.C,v 1.57 2001/10/08 14:09:18 parser Exp $
 */
-static const char *RCSId="$Id: file.C,v 1.47 2001/08/21 11:12:20 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -29,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 {
@@ -51,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) {
@@ -70,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()));
@@ -109,18 +111,20 @@ 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->get(2).as_string().cstr()
+		: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) {
@@ -222,7 +226,8 @@ static void _exec_cgi(Request& r, const
 			*argv+=&params->get(i).as_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;
@@ -302,20 +307,20 @@ static void _list(Request& r, const Stri
 		int erroffset;
 		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
 			&errptr, &erroffset, 
-			r.pcre_tables);
+			r.pcre_tables());
 
 		if(!regexp_code)
 			PTHROW(0, 0, 
 				&regexp->mid(erroffset, regexp->size()), 
 				"regular expression syntax error - %s", errptr);
 
-		ovector=(int *)malloc(sizeof(int)*(ovecsize=(1/*match*/)*3));
+		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_NAME);
+		.cstr(String::UL_FILE_SPEC);
 
 	Array& columns=*new(pool) Array(pool);
 	columns+=new(pool) String(pool, "name");	
@@ -341,10 +346,10 @@ static void _list(Request& r, const Stri
 		}
 
 		if(suits) {
-			char *file_name_cstr=(char *)r.malloc(file_name_size);
+			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_NAME, 
+			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);
@@ -367,8 +372,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);
@@ -380,9 +385,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);