--- parser3/src/classes/file.C	2004/12/23 15:36:12	1.131
+++ parser3/src/classes/file.C	2005/08/09 08:14:47	1.136
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b file parser class.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_FILE_C="$Date: 2004/12/23 15:36:12 $";
+static const char * const IDENT_FILE_C="$Date: 2005/08/09 08:14:47 $";
 
 #include "pa_config_includes.h"
 
@@ -35,12 +35,17 @@ static const char * const IDENT_FILE_C="
 
 #define NAME_NAME "name"
 
+// externs
+
+extern String sql_limit_name;
+extern String sql_offset_name;
+
 // class
 
 class MFile: public Methoded {
 public: // VStateless_class
 	
-	Value* create_new_value(Pool&) { return new VFile(); }
+	Value* create_new_value(Pool&, HashStringValue&) { return new VFile(); }
 
 public: // Methoded
 	bool used_directly() { return true; }
@@ -160,9 +165,24 @@ static void _load(Request& r, MethodPara
 	if(third_param_hash)
 		alt_filename_param_index++;
 
+	HashStringValue* options=third_param_hash;
+	size_t offset=0;
+	size_t limit=0;
+	if(options) {
+		options=new HashStringValue(*options);
+		if(Value *voffset=(Value *)options->get(sql_offset_name)) {
+			options->remove(sql_offset_name);
+			offset=r.process_to_value(*voffset).as_int();
+		}
+		if(Value *vlimit=(Value *)options->get(sql_limit_name)) {
+			options->remove(sql_limit_name);
+			limit=r.process_to_value(*vlimit).as_int();
+		}
+		// no check on options count here, see file_read
+	}
 	File_read_result file=file_read(r.charsets, lfile_name,
 		is_text_mode(vmode_name.as_string()),
-		third_param_hash
+		options, true, 0, offset, limit
 	);
 
 	const char *user_file_name=params.count()>alt_filename_param_index?
@@ -240,7 +260,7 @@ static void append_env_pair(
 			throw Exception("parser.runtime",
 				new String(akey, String::L_TAINTED),
 				"not safe environment variable");
-		info->env->put(akey, avalue->as_string().cstr(String::L_UNSPECIFIED));
+		info->env->put(akey, avalue->as_string().cstr_to_string_body(String::L_UNSPECIFIED));
 	}
 }
 #ifndef DOXYGEN
@@ -765,12 +785,12 @@ MFile::MFile(): Methoded("file") {
 	// ^cgi[file-name]
 	// ^cgi[file-name;env hash]
 	// ^cgi[file-name;env hash;1cmd;2line;3ar;4g;5s]
-	add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+10);
+	add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+50);
 
 	// ^exec[file-name]
 	// ^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);
+	add_native_method("exec", Method::CT_DYNAMIC, _exec, 1, 2+50);
 
 	// ^file:list[path]
 	// ^file:list[path][regexp]