--- parser3/src/classes/file.C	2007/11/14 12:46:02	1.162
+++ parser3/src/classes/file.C	2008/07/03 09:18:52	1.172
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_FILE_C="$Date: 2007/11/14 12:46:02 $";
+static const char * const IDENT_FILE_C="$Date: 2008/07/03 09:18:52 $";
 
 #include "pa_config_includes.h"
 
@@ -232,8 +232,7 @@ static void _load(Request& r, MethodPara
 		:lfile_name.cstr(String::L_FILE_SPEC);
 
 	Value* vcontent_type=0;
-	if(file.headers)
-	{
+	if(file.headers){
 		if(Value* remote_content_type=file.headers->get("CONTENT-TYPE"))
 			vcontent_type=new VString(*new String(remote_content_type->as_string().cstr()));
 	} 
@@ -242,8 +241,21 @@ static void _load(Request& r, MethodPara
 	
 	VFile& self=GET_SELF(r, VFile);
 	self.set(true/*tainted*/, file.str, file.length, user_file_name, vcontent_type);
-	if(file.headers)
+
+	if(file.headers){
 		file.headers->for_each<HashStringValue*>(_load_pass_param, &self.fields());
+	} else {
+		size_t size;
+		time_t atime, mtime, ctime;
+
+		file_stat(lfile_name, size, atime, mtime, ctime);
+	
+		HashStringValue& ff=self.fields();
+		ff.put(adate_name, new VDate(atime));
+		ff.put(mdate_name, new VDate(mtime));
+		ff.put(cdate_name, new VDate(ctime));
+	}
+
 }
 
 static void _create(Request& r, MethodParams& params) {
@@ -276,13 +288,15 @@ static void _stat(Request& r, MethodPara
 		size,
 		atime, mtime, ctime);
 	
+	const char* user_file_name=lfile_name.cstr(String::L_FILE_SPEC);
+
 	VFile& self=GET_SELF(r, VFile);
-	self.set(true/*tainted*/, 0/*no bytes*/, size);
+
+	self.set(true/*tainted*/, 0/*no bytes*/, size, user_file_name, new VString(r.mime_type_of(user_file_name)));
 	HashStringValue& ff=self.fields();
 	ff.put(adate_name, new VDate(atime));
 	ff.put(mdate_name, new VDate(mtime));
 	ff.put(cdate_name, new VDate(ctime));
-	ff.put(content_type_name, new VString(r.mime_type_of(lfile_name.cstr(String::L_FILE_SPEC))));
 }
 
 static bool is_safe_env_key(const char* key) {
@@ -351,11 +365,6 @@ static void append_to_argv(Request& r, A
 	}
 }
 
-inline size_t strpos(const char *s1, const char *s2) {
-	const char *p = strstr(s1, s2);
-	return (p==0)?(size_t)-1:p-s1;
-}
-
 /// @todo fix `` in perl - they produced flipping consoles and no output to perl
 static void _exec_cgi(Request& r, MethodParams& params,
 					  bool cgi) {
@@ -488,65 +497,71 @@ static void _exec_cgi(Request& r, Method
 	// match silent conversion in OS
 
 	// exec!
-	PA_exec_result execution=
-		pa_exec(false/*forced_allow*/, script_name, &env, argv, *in);
+	PA_exec_result execution=pa_exec(false/*forced_allow*/, script_name, &env, argv, *in);
 
 	File_read_result *file_out=&execution.out;
 	String *real_err=&execution.err;
 
-	if(is_text_mode(mode_name)){
+	// transcode err if necessary (@todo: need fix line breaks in err as well )
+	if(charset)
+		real_err=&Charset::transcode(*real_err, *charset, r.charsets.source());
+
+	if(file_out->length && is_text_mode(mode_name)){
 		fix_line_breaks(file_out->str, file_out->length);
 		// treat output as string
 		String *real_out = new String(file_out->str, file_out->length);
 
-		// transcode if necessary
-		if(charset) {
+		// transcode out if necessary
+		if(charset)
 			real_out=&Charset::transcode(*real_out, *charset, r.charsets.source());
-			real_err=&Charset::transcode(*real_err, *charset, r.charsets.source());
-		}
+
 		// FIXME: unsafe cast
-		file_out->str = (char*)real_out->cstr();
+		file_out->str=const_cast<char *>(real_out->cstr()); // hacking a little
 		file_out->length = real_out->length();
 	}
 
 	VFile& self=GET_SELF(r, VFile);
 
 	if(cgi) { // ^file::cgi
-	const char* eol_marker=0; size_t eol_marker_size;
+		const char* eol_marker=0;
+		size_t eol_marker_size;
+
 		// construct with 'out' body and header
-		size_t dos_pos=strpos(file_out->str, "\r\n\r\n");
-		size_t unix_pos=strpos(file_out->str, "\n\n");
+		size_t dos_pos=(file_out->length)?strpos(file_out->str, "\r\n\r\n"):STRING_NOT_FOUND;
+		size_t unix_pos=(file_out->length)?strpos(file_out->str, "\n\n"):STRING_NOT_FOUND;
 
 		bool unix_header_break;
 		switch((dos_pos!=STRING_NOT_FOUND?10:00) + (unix_pos!=STRING_NOT_FOUND?01:00)) {
-		case 10: // dos
-			unix_header_break=false;
-			break;
-		case 01: // unix
-			unix_header_break=true;
-			break;
-		case 11: // dos & unix
-			unix_header_break=unix_pos<dos_pos;
-			break;
-		default: // 00
-			unix_header_break=false; // calm down, compiler
-			throw Exception(0,
-				0,
-				"output does not contain CGI header; "
-				"exit status=%d; stdoutsize=%u; stdout: \"%s\"; stderrsize=%u; stderr: \"%s\"", 
-					execution.status, 
-					(uint)file_out->length, file_out->str,
-					(uint)real_err->length(), real_err->cstr());
-			break; //never reached
+			case 10: // dos
+				unix_header_break=false;
+				break;
+			case 01: // unix
+				unix_header_break=true;
+				break;
+			case 11: // dos & unix
+				unix_header_break=unix_pos<dos_pos;
+				break;
+			default: // 00
+				unix_header_break=false; // calm down, compiler
+				throw Exception(0,
+					0,
+					"output does not contain CGI header; "
+					"exit status=%d; stdoutsize=%u; stdout: \"%s\"; stderrsize=%u; stderr: \"%s\"", 
+						execution.status, 
+						(size_t)file_out->length, (file_out->length) ? (file_out->str) : "",
+						(size_t)real_err->length(), real_err->cstr());
+				break; //never reached
 		}
 
-		int header_break_pos;
+		size_t header_break_pos;
 		if(unix_header_break) {
 			header_break_pos=unix_pos;
-			eol_marker="\n"; eol_marker_size=1;
+			eol_marker="\n";
+			eol_marker_size=1;
 		} else {
 			header_break_pos=dos_pos;
-			eol_marker="\r\n"; eol_marker_size=2;
+			eol_marker="\r\n";
+			eol_marker_size=2;
 		}
 
 		file_out->str[header_break_pos] = 0;
@@ -555,7 +570,7 @@ static void _exec_cgi(Request& r, Method
 		file_out->str += headersize;
 		file_out->length -= headersize;
 
-		// body
+		// $body
 		self.set(false/*not tainted*/, file_out->str, file_out->length);
 
 		// $fields << header
@@ -570,7 +585,8 @@ static void _exec_cgi(Request& r, Method
 			if(info.content_type)
 				self.fields().put(content_type_name, info.content_type);
 		}
-	} else {
+	} else { // ^file::exec
+		// $body
 		self.set(false/*not tainted*/, file_out->str, file_out->length);
 	}
 
@@ -856,9 +872,10 @@ static void _sql(Request& r, MethodParam
 		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
 	File_sql_event_handlers handlers(statement_string, statement_cstr);
 
+	ulong offset=0;
+
 	if(params.count()>1)
-		if(HashStringValue* options=
-			params.as_no_junction(1, PARAM_MUST_NOT_BE_CODE).get_hash()) {
+		if(HashStringValue* options=params.as_no_junction(1, PARAM_MUST_NOT_BE_CODE).get_hash()){
 			int valid_options=0;
 			if(Value* vfilename=options->get(NAME_NAME)) {
 				valid_options++;
@@ -868,6 +885,10 @@ static void _sql(Request& r, MethodParam
 				valid_options++;
 				handlers.user_content_type=&vcontent_type->as_string();
 			}
+			if(Value* voffset=options->get(sql_offset_name)) {
+				valid_options++;
+				offset=(ulong)r.process_to_value(*voffset).as_double();
+			}
 			if(valid_options!=options->count())
 				throw Exception(PARSER_RUNTIME,
 					0,
@@ -878,7 +899,7 @@ static void _sql(Request& r, MethodParam
 	r.connection()->query(
 		statement_cstr, 
 		0, 0,
-		0, 0, 
+		offset, 1/*limit*/,
 		handlers,
 		statement_string);