--- parser3/src/classes/file.C	2002/01/25 12:09:03	1.69
+++ parser3/src/classes/file.C	2002/04/15 13:17:03	1.78
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b file parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: file.C,v 1.69 2002/01/25 12:09:03 paf Exp $
+	$Id: file.C,v 1.78 2002/04/15 13:17:03 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -85,18 +85,18 @@ static void _find(Request& r, const Stri
 
 	// passed file name simply exists in current dir
 	if(file_readable(r.absolute(lfile_name))) {
-		r.write_no_lang(*new(pool) VString(lfile_name));
+		r.write_no_lang(lfile_name);
 		return;
 	}
 
 	// scan .. dirs for result
 	for(int i=0; i<FIND_MONKEY_MAX_HOPS; i++) {
-		String test_name(pool);
+		String local_test_name(pool);
 		for(int j=0; j<i; j++)
-			test_name.APPEND_CONST("../");
-		test_name.append(lfile_name, String::UL_CLEAN);
-		if(file_readable(r.absolute(test_name))) {
-			r.write_no_lang(*new(pool) VString(*new(pool) String(test_name)));
+			local_test_name.APPEND_CONST("../");
+		local_test_name.append(lfile_name, String::UL_CLEAN);
+		if(file_readable(r.absolute(local_test_name))) {
+			r.write_no_lang(*new(pool) String(local_test_name));
 			return;
 		}
 	}
@@ -236,7 +236,7 @@ static void _exec_cgi(Request& r, const
 	//out.APPEND_CONST("content-type:text/plain\nheader:test-header\n\ntest-body");
 	//out<<in;
 	String& err=*new(pool) String(pool);
-	int status=pa_exec(script_name, &env, argv, in, out, err);
+	int status=pa_exec(false/*forced_allow*/, script_name, &env, argv, in, out, err);
 
 	VFile& self=*static_cast<VFile *>(r.self);
 
@@ -252,7 +252,7 @@ static void _exec_cgi(Request& r, const
 		}
 		if(pos<0) {
 			delim_size=0; // calm down, compiler
-			throw Exception(0, 0,
+			throw Exception(0,
 				&method_name,
 				"output does not contain CGI header; exit code=%d; outsize=%u; out: \"%s\"; errsize=%u; err: \"%s\"", 
 					status, 
@@ -314,7 +314,7 @@ static void _list(Request& r, const Stri
 			pool.get_client_charset().pcre_tables);
 
 		if(!regexp_code)
-			throw Exception(0, 0, 
+			throw Exception(0, 
 				&regexp->mid(erroffset, regexp->size()), 
 				"regular expression syntax error - %s", errptr);
 
@@ -342,7 +342,7 @@ static void _list(Request& r, const Stri
 				suits=false;
 			else if(exec_result<0) {
 				(*pcre_free)(regexp_code);
-				throw Exception(0, 0, 
+				throw Exception(0, 
 					regexp, 
 					"regular expression execute (%d)", 
 						exec_result);
@@ -388,7 +388,7 @@ static void _lock(Request& r, const Stri
 	Value& body_code=params->as_junction(1, "body must be code");
 
 	Lock_execute_body_info info={&r, &body_code};
-	file_action_under_lock(file_spec, "lock", lock_execute_body, &info);
+	file_write_action_under_lock(file_spec, "lock", lock_execute_body, &info);
 }
 
 // constructor