--- parser3/src/classes/file.C	2001/10/29 17:49:57	1.63
+++ parser3/src/classes/file.C	2002/06/11 12:20:41	1.82
@@ -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://design.ru/paf)
+	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.63 2001/10/29 17:49:57 paf Exp $
+	$Id: file.C,v 1.82 2002/06/11 12:20:41 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -20,13 +20,12 @@
 #include "pa_vdate.h"
 #include "pa_dir.h"
 #include "pa_vtable.h"
+#include "pa_charset.h"
 
 // consts
 
 // defines
 
-#define FILE_CLASS_NAME "file"
-
 #define TEXT_MODE_NAME "text"
 
 // class
@@ -60,20 +59,18 @@ static void _save(Request& r, const Stri
 }
 
 static void _delete(Request& r, const String&, MethodParams *params) {
-	Pool& pool=r.pool();
 	Value& vfile_name=params->as_no_junction(0, "file name must not be code");
 
 	// unlink
-	file_delete(pool, r.absolute(vfile_name.as_string()));
+	file_delete(r.absolute(vfile_name.as_string()));
 }
 
 static void _move(Request& r, const String&, MethodParams *params) {
-	Pool& pool=r.pool();
 	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");
 
 	// move
-	file_move(pool, 
+	file_move(
 		r.absolute(vfrom_file_name.as_string()),
 		r.absolute(vto_file_name.as_string()));
 }
@@ -86,18 +83,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;
 		}
 	}
@@ -180,6 +177,8 @@ static void _exec_cgi(Request& r, const
 			name##value.APPEND_CONST(value_cstr); \
 			env.put(name##key, &name##value); \
 		}
+	// passing SAPI::environment
+	/*
 	#define EPASS(name) \
 		String name##key(pool, #name); \
 		String name##value(pool); \
@@ -188,12 +187,31 @@ static void _exec_cgi(Request& r, const
 			env.put(name##key, &name##value); \
 		}
 
+	EPASS(SERVER_PROTOCOL);
+	EPASS(SERVER_NAME);
+	EPASS(SERVER_PORT);
+	EPASS(REMOTE_ADDR);
+	EPASS(REMOTE_HOST);
+	EPASS(REMOTE_USER);
+	EPASS(HTTP_REFERER);
+	EPASS(HTTP_USER_AGENT);
+	EPASS(HTTP_COOKIE);
+	*/
+	if(const char *const *pairs=SAPI::environment(pool)) {
+		while(const char *pair=*pairs++)
+			if(const char *eq_at=strchr(pair, '=')) {
+				String& key=*new(pool) String(pool, pair, eq_at-pair);
+				String& value=*new(pool) String(pool, eq_at+1);
+				env.put(key, &value);
+			}
+	}
+
 	// const
 	ECSTR(GATEWAY_INTERFACE, "CGI/1.1");
 	// from Request.info
 	ECSTR(DOCUMENT_ROOT, r.info.document_root);
 	ECSTR(PATH_TRANSLATED, r.info.path_translated);
-	ECSTR(SERVER_PROTOCOL, r.info.method);
+	ECSTR(REQUEST_METHOD, r.info.method);
 	ECSTR(QUERY_STRING, r.info.query_string);
 	ECSTR(REQUEST_URI, r.info.uri);
 	ECSTR(CONTENT_TYPE, r.info.content_type);
@@ -201,21 +219,9 @@ static void _exec_cgi(Request& r, const
 	snprintf(content_length_cstr, MAX_NUMBER, "%u", r.info.content_length);
 	String content_length(pool, content_length_cstr);
 	ECSTR(CONTENT_LENGTH, content_length_cstr);
-	ECSTR(HTTP_COOKIE, r.info.cookie);
-	ECSTR(HTTP_USER_AGENT, r.info.user_agent);
-	// passing some SAPI:get_env-s
-	EPASS(SERVER_NAME);
-	EPASS(SERVER_PORT);
-	EPASS(HTTP_REFERER);
-	EPASS(REMOTE_ADDR);
-	EPASS(REMOTE_HOST);
-	EPASS(REMOTE_USER);
-	// SCRIPT_NAME
+	// SCRIPT_*
 	env.put(*new(pool) String(pool, "SCRIPT_NAME"), &script_name);
-#ifdef WIN32
-	// WIN32 shell
-	EPASS(COMSPEC);
-#endif
+	//env.put(*new(pool) String(pool, "SCRIPT_FILENAME"), ??&script_name);
 
 	if(params->size()>1) {
 		Value& venv=params->as_no_junction(1, "env must not be code");
@@ -236,7 +242,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,9 +258,9 @@ 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\"", 
+				"output does not contain CGI header; exit status=%d; stdoutsize=%u; stdout: \"%s\"; stderrsize=%u; stderr: \"%s\"", 
 					status, 
 					(uint)out.size(), out.cstr(),
 					(uint)err.size(), err.cstr());
@@ -271,7 +277,7 @@ static void _exec_cgi(Request& r, const
 		}
 	}
 	// body
-	self.set(false/*not tainted*/, body->cstr(String::UL_AS_IS), body->size());
+	self.set(false/*not tainted*/, body->cstr(), body->size());
 
 	// $status
 	self.fields().put(
@@ -301,24 +307,22 @@ static void _list(Request& r, const Stri
 
 	const String *regexp;
 	pcre *regexp_code;
-	int ovecsize;
-	int *ovector;
+	const int ovecsize=(1/*match*/)*3;
+	int ovector[ovecsize];
 	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 *pattern=regexp->cstr();
 		const char *errptr;
 		int erroffset;
 		regexp_code=pcre_compile(pattern, PCRE_EXTRA | PCRE_DOTALL, 
 			&errptr, &erroffset, 
-			r.pcre_tables());
+			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);
-
-		ovector=(int *)pool.malloc(sizeof(int)*(ovecsize=(1/*match*/)*3));
 	} else 
 		regexp_code=0;
 
@@ -342,7 +346,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);
@@ -367,16 +371,32 @@ static void _list(Request& r, const Stri
 
 	// write out result
 	VTable& result=*new(pool) VTable(pool, &table);
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
-// constructor
+#ifndef DOXYGEN
+struct Lock_execute_body_info {
+	Request *r;
+	Value *body_code;
+};
+#endif
+static void lock_execute_body(int , void *context) {
+	Lock_execute_body_info& info=*static_cast<Lock_execute_body_info *>(context);
 
-MFile::MFile(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), FILE_CLASS_NAME));
+	// execute body
+	info.r->write_assign_lang(info.r->process(*info.body_code));
+};
+static void _lock(Request& r, const String& method_name, MethodParams *params) {
+	const String& file_spec=r.absolute(params->as_string(0, "file name must be string"));
+	Value& body_code=params->as_junction(1, "body must be code");
 
+	Lock_execute_body_info info={&r, &body_code};
+	file_write_action_under_lock(file_spec, "lock", lock_execute_body, &info);
+}
 
+// constructor
+
+MFile::MFile(Pool& apool) : Methoded(apool, "file") {
 	// ^save[mode;file-name]
 	add_native_method("save", Method::CT_DYNAMIC, _save, 2, 2);
 
@@ -411,6 +431,9 @@ MFile::MFile(Pool& apool) : Methoded(apo
 	// ^file:list[path][regexp]
 	add_native_method("list", Method::CT_STATIC, _list, 1, 2);
 
+	// ^file:lock[path]{code}
+	add_native_method("lock", Method::CT_STATIC, _lock, 2, 2);
+
 }
 
 // global variable