--- parser3/src/classes/file.C	2001/04/09 16:04:45	1.24
+++ parser3/src/classes/file.C	2001/04/15 13:12:17	1.26
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: file.C,v 1.24 2001/04/09 16:04:45 paf Exp $
+	$Id: file.C,v 1.26 2001/04/15 13:12:17 paf Exp $
 */
 
 #include "pa_request.h"
@@ -25,37 +25,24 @@ VStateless_class *file_class;
 
 // methods
 
-static void _save(Request& r, const String& method_name, Array *params) {
-	Pool& pool=r.pool();
-	Value& vfile_name=*static_cast<Value *>(params->get(0));
-	// forcing
-	// ^save[this body type]
-	r.fail_if_junction_(true, vfile_name, 
-		method_name, "file name must not be code");
+static void _save(Request& r, const String&, MethodParams *params) {
+	Value& vfile_name=params->get_no_junction(0, "file name must not be code");
 
 	// save
 	static_cast<VFile *>(r.self)->save(r.absolute(vfile_name.as_string()));
 }
 
-static void _delete(Request& r, const String& method_name, Array *params) {
+static void _delete(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
-	Value& vfile_name=*static_cast<Value *>(params->get(0));
-	// forcing
-	// ^delete[this body type]
-	r.fail_if_junction_(true, vfile_name, 
-		method_name, "file name must not be code");
+	Value& vfile_name=params->get_no_junction(0, "file name must not be code");
 
 	// unlink
 	file_delete(pool, r.absolute(vfile_name.as_string()));
 }
 
-static void _find(Request& r, const String& method_name, Array *params) {
+static void _find(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Value& vfile_name=*static_cast<Value *>(params->get(0));
-	// forcing
-	// ^delete[this body type]
-	r.fail_if_junction_(true, vfile_name, 
-		method_name, "file name must not be code");
+	Value& vfile_name=params->get_no_junction(0, "file name must not be code");
 
 	const String &lfile_name=vfile_name.as_string();
 
@@ -79,21 +66,14 @@ static void _find(Request& r, const Stri
 
 	// not found
 	if(params->size()==2) {
-		// forcing ..{this body type}
-		Value& not_found_code=*static_cast<Value *>(params->get(1));
-		r.fail_if_junction_(false, not_found_code, 
-			method_name, "not-found param must be code");
+		Value& not_found_code=params->get_junction(1, "not-found param must be code");
 		r.write_pass_lang(r.process(not_found_code));
 	}
 }
 
-static void _load(Request& r, const String& method_name, Array *params) {
+static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	Value& vfile_name=*static_cast<Value *>(params->get(0));
-
-	// forcing ^load[this body type]
-	r.fail_if_junction_(true, vfile_name, 
-		method_name, "file name must not be code");
+	Value& vfile_name=params->get_no_junction(0, "file name must not be code");
 
 	const String& lfile_name=vfile_name.as_string();
 
@@ -101,12 +81,23 @@ static void _load(Request& r, const Stri
 	file_read(pool, r.absolute(lfile_name), data, size, false/*binary*/);
 
 	char *user_file_name=params->size()==1?lfile_name.cstr(String::UL_FILE_NAME)
-		:static_cast<Value *>(params->get(1))->as_string().cstr();
+		:params->get(1).as_string().cstr();
 	
 	static_cast<VFile *>(r.self)->set(true/*tainted*/, data, size, 
 		user_file_name, &r.mime_type_of(user_file_name));
 }
 
+static void _stat(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	Value& vfile_name=params->get_no_junction(0, "file name must not be code");
+
+	const String& lfile_name=vfile_name.as_string();
+
+	size_t size=file_size(r.absolute(lfile_name));
+	
+	static_cast<VFile *>(r.self)->set(true/*tainted*/, 0/*no bytes*/, size);
+}
+
 static void append_env_pair(const Hash::Key& key, Hash::Val *value, void *info) {
 	Hash& hash=*static_cast<Hash *>(info);
 	hash.put(key, &static_cast<Value *>(value)->as_string());
@@ -115,13 +106,10 @@ static void append_env_pair(const Hash::
 /// ^exec[file-name;env hash]
 /// ^exec[file-name;env hash;cmd;line;arg;s]
 /// @test header to $fields. waits for header '\' tricks
-static void _cgi(Request& r, const String& method_name, Array *params) {
+static void _cgi(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	Value& vfile_name=*static_cast<Value *>(params->get(0));
-	// forcing [this param type]
-	r.fail_if_junction_(true, vfile_name, 
-		method_name, "file name must not be code");
+	Value& vfile_name=params->get_no_junction(0, "file name must not be code");
 
 	const String& script_name=r.absolute(vfile_name.as_string());
 
@@ -166,10 +154,7 @@ static void _cgi(Request& r, const Strin
 	env.put(String(pool, "SCRIPT_NAME"), &script_name);
 
 	if(params->size()>1) {
-		Value& venv=*static_cast<Value *>(params->get(1));
-		// forcing [this param type]
-		r.fail_if_junction_(true, venv, 
-			method_name, "env must not be code");
+		Value& venv=params->get_no_junction(1, "env must not be code");
 		if(Hash *user_env=venv.get_hash())
 			user_env->for_each(append_env_pair, &env);
 		else
@@ -182,7 +167,7 @@ static void _cgi(Request& r, const Strin
 	if(params->size()>2) {
 		argv=new(pool) Array(pool, params->size()-2);
 		for(int i=2; i<params->size(); i++)
-			*argv+=&static_cast<Value *>(params->get(i))->as_string();
+			*argv+=&params->get(i).as_string();
 	}
 
 	const String in(pool, r.post_data, r.post_size);
@@ -244,6 +229,9 @@ void initialize_file_class(Pool& pool, V
 	// ^load[disk-name;user-name]
 	vclass.add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
 
+	// ^stat[disk-name]
+	vclass.add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1);
+
 	// ^exec[file-name]
 	// ^exec[file-name;env hash]
 	// ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s]