--- parser3/src/classes/mail.C	2003/03/24 10:31:17	1.88.2.16.2.10
+++ parser3/src/classes/mail.C	2003/04/01 13:50:51	1.88.2.16.2.15
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_MAIL_C="$Date: 2003/03/24 10:31:17 $";
+static const char* IDENT_MAIL_C="$Date: 2003/04/01 13:50:51 $";
 
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
@@ -96,55 +96,54 @@ static void sendmail(Request& r,
 	// $MAIN:MAIL.sendmail["/usr/sbin/sendmail -t -i -f postmaster"] default
 	// $MAIN:MAIL.sendmail["/usr/lib/sendmail -t -i  -f postmaster"] default
 
-	const String& sendmail_command;
+	const String* sendmail_command;
 	if(vmail_conf) {
 #ifdef PA_FORCED_SENDMAIL
 		throw Exception("parser.runtime",
-			method_name,
+			0,
 			"Parser was configured with --with-sendmail="PA_FORCED_SENDMAIL
 			" key, to change sendmail you should reconfigure and recompie it");
 #else
 		if(Value* sendmail_value=vmail_conf->get_hash()->get(mail_sendmail_name))
-			sendmail_command=sendmail_value->as_string();
+			sendmail_command=&sendmail_value->as_string();
 		else
 			throw Exception("parser.runtime",
-				method_name,
+				0,
 				"$"MAIN_CLASS_NAME":"MAIL_NAME"."MAIL_SENDMAIL_NAME" not defined");
 #endif
 	} else {
 #ifdef PA_FORCED_SENDMAIL
-		sendmail_command=String* (new String(PA_FORCED_SENDMAIL));
+		sendmail_command=new String(PA_FORCED_SENDMAIL);
 #else
-		const String& test(new String("/usr/sbin/sendmail"));
-		if(!file_executable(test))
-			test=String* (new String("/usr/lib/sendmail"));
-		test->APPEND_CONST(" -t -i -f postmaster");
-		sendmail_command=test;
+		sendmail_command=new String("/usr/sbin/sendmail");
+		if(!file_executable(*sendmail_command))
+			sendmail_command=new String("/usr/lib/sendmail");
+		*sendmail_command<<" -t -i -f postmaster";
 #endif
 	}
 
 	// we know sendmail_command here, should replace "postmaster" with "$from" from message
-	int at_postmaster=sendmail_command->pos("postmaster");
-	if(at_postmaster>0) {
-		const String& reconstructed=sendmail_command->mid(0, at_postmaster);
-		*reconstructed << *from;
-		*reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->length());
-		sendmail_command=reconstructed;
+	size_t at_postmaster=sendmail_command->pos("postmaster");
+	if(at_postmaster!=STRING_NOT_FOUND) {
+		String& reconstructed=sendmail_command->mid(0, at_postmaster);
+		reconstructed << *from;
+		reconstructed << sendmail_command->mid(at_postmaster+10/*postmaster*/, sendmail_command->length());
+		sendmail_command=&reconstructed;
 	}
 
 	// execute it
 	ArrayString argv;
-	const String& file_spec;
-	int after_file_spec=sendmail_command->pos(" ", 1);
-	if(after_file_spec<=0)
+	const String* file_spec;
+	size_t after_file_spec=sendmail_command->pos(' ');
+	if(after_file_spec==STRING_NOT_FOUND || after_file_spec==0)
 		file_spec=sendmail_command;
 	else {
 		size_t pos_after=after_file_spec;
-		file_spec=sendmail_command->mid(0, pos_after++);
-		sendmail_command->split(argv, &pos_after, " ", 1, String::L_AS_IS);
+		file_spec=&sendmail_command->mid(0, pos_after++);
+		sendmail_command->split(argv, pos_after, " ", String::L_AS_IS);
 	}
 
-	if(!file_executable(file_spec))
+	if(!file_executable(*file_spec))
 		throw Exception("email.send",
 			file_spec, 
 			"is not executable."
@@ -157,23 +156,23 @@ static void sendmail(Request& r,
 
 
 	String in(message_cstr); String out; String err;
-	PA_exec_result exec=pa_exec(pool,
+	PA_exec_result exec=pa_exec(
 		// forced_allow
 #ifdef PA_FORCED_SENDMAIL
 		true
 #else
 		false
 #endif
-		, file_spec,
+		, *file_spec,
 		0 /* pass env */,
 		argv,
 		in);
-	if(exec.status || exec.err->length())
+	if(exec.status || exec.err.length())
 		throw Exception("email.send",
-			method_name,
+			0,
 			"'%s' reported problem: %s (%d)",
-				file_spec->cstr().get(),
-				exec.err->length()?exec.err->cstr().get():"UNKNOWN", 
+				file_spec->cstr(),
+				exec.err.length()?exec.err.cstr():"UNKNOWN", 
 				exec.status);
 #endif
 }
@@ -189,7 +188,7 @@ static void _send(Request& r, MethodPara
 			"message must be hash");
 
 	const String* from=0;
-	const String* to=0;
+	String* to=0;
 	const String& message=
 		GET_SELF(r, VMail).message_hash_to_string(r, hash, 0, from, 
 #ifdef WIN32