--- parser3/src/classes/mail.C	2003/11/04 12:29:16	1.91
+++ parser3/src/classes/mail.C	2003/11/21 12:44:41	1.97
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_MAIL_C="$Date: 2003/11/04 12:29:16 $";
+static const char * const IDENT_MAIL_C="$Date: 2003/11/21 12:44:41 $";
 
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
@@ -20,7 +20,7 @@ static const char* IDENT_MAIL_C="$Date:
 #include "pa_vmail.h"
 
 #ifdef _MSC_VER
-#	include "smtp/smtp.h"
+#	include "smtp.h"
 #endif
 
 // defines
@@ -60,8 +60,16 @@ static const String mail_sendmail_name(S
 
 static void sendmail(Request& r, 
 		     const String& message, 
-		     const String* from, const String* to,
-			 const String* options) {
+		     const String* from, const String* 
+#ifdef _MSC_VER
+			 to
+#endif
+			 ,
+			 const String* 
+#ifndef _MSC_VER
+			 options
+#endif
+			 ) {
 	const char* message_cstr=message.cstr(String::L_UNSPECIFIED);
 	Value* vmail_conf=static_cast<Value*>(r.classes_conf.get(mail_base_class->name()));
 
@@ -97,7 +105,7 @@ 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;
+	String* sendmail_command=new String;
 	if(vmail_conf) {
 #ifdef PA_FORCED_SENDMAIL
 		throw Exception("parser.runtime",
@@ -106,7 +114,7 @@ static void sendmail(Request& r,
 			" 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",
 				0,
@@ -114,17 +122,17 @@ static void sendmail(Request& r,
 #endif
 	} else {
 #ifdef PA_FORCED_SENDMAIL
-		sendmail_command=new String(PA_FORCED_SENDMAIL);
+		*sendmail_command<<PA_FORCED_SENDMAIL;
 #else
 		String* test=new String("/usr/sbin/sendmail");
 		if(!file_executable(*test))
 			test=new String("/usr/lib/sendmail");
-		*test<<" -t -i -f postmaster";
-		sendmail_command=test;
+		*sendmail_command<<*test;
+		*sendmail_command<<" -t -i -f postmaster";
 #endif
 	}
 	if(options)
-		sendmail_command<<" "<<*options;
+		*sendmail_command<<" "<<*options;
 
 	// we know sendmail_command here, should replace "postmaster" with "$from" from message
 	size_t at_postmaster=sendmail_command->pos("postmaster");
@@ -159,7 +167,7 @@ static void sendmail(Request& r,
 		);
 
 
-	String in(message_cstr); String out; String err;
+	String in(message_cstr);
 	PA_exec_result exec=pa_exec(
 		// forced_allow
 #ifdef PA_FORCED_SENDMAIL