--- parser3/src/classes/mail.C	2001/12/25 09:00:28	1.49
+++ parser3/src/classes/mail.C	2002/02/06 08:54:22	1.52
@@ -4,15 +4,11 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: mail.C,v 1.49 2001/12/25 09:00:28 paf Exp $
+	$Id: mail.C,v 1.52 2002/02/06 08:54:22 paf Exp $
 */
 
 #include "pa_config_includes.h"
 
-#ifdef _MSC_VER
-#	include "smtp/smtp.h"
-#endif
-
 #include "pa_common.h"
 #include "pa_request.h"
 #include "pa_vfile.h"
@@ -20,6 +16,10 @@
 #include "pa_charsets.h"
 #include "pa_charset.h"
 
+#ifdef _MSC_VER
+#	include "smtp/smtp.h"
+#endif
+
 // defines
 
 #define MAIL_CLASS_NAME "mail"
@@ -365,66 +365,57 @@ static void sendmail(Request& r, const S
 			"$"MAIN_CLASS_NAME":"MAIL_NAME".SMTP not defined");
 #else
 	// unix
-	// $MAIN:MAIL.prog1["/usr/sbin/sendmail -t"] default
-	// $MAIN:MAIL.prog2["/usr/lib/sendmail -t"] default
-	char no_cstr[MAX_NUMBER];
-	for(int no=-2; ; no++) {
-		const String *prog_string;
-		switch(no) {
-		case -2: prog_string=new(pool) String(pool, "/usr/sbin/sendmail -t"); break;
-		case -1: prog_string=new(pool) String(pool, "/usr/lib/sendmail -t"); break;
-		default: 
-			{
-				String prog_key(pool, "prog");
-				snprintf(no_cstr, MAX_NUMBER, "%d", no);
-				prog_key << no_cstr;
-				if(mail_conf) {
-					if(Value *prog_value=static_cast<Value *>(mail_conf->get(prog_key)))
-						prog_string=&prog_value->as_string();
-					else
-						if(no==0)
-							continue;
-						else
-							throw Exception(0, 0,
-								&method_name,
-								"$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", 
-								prog_key.cstr());
-				} else
-					throw Exception(0, 0,
-						&method_name,
-						"$" MAIN_CLASS_NAME ":" MAIL_NAME " not defined");
-			}
-		}
-		// we know prog_string here
-		Array argv(pool);
-		const String *file_spec;
-		int after_file_spec=prog_string->pos(" ", 1);
-		if(after_file_spec<=0)
-			file_spec=prog_string;
-		else {
-			size_t pos_after=after_file_spec;
-			file_spec=&prog_string->mid(0, pos_after);
-			prog_string->split(argv, &pos_after, " ", 1, String::UL_AS_IS);
-		}
+	// $MAIN:MAIL.sendmail["/usr/sbin/sendmail -t"] default
+	// $MAIN:MAIL.sendmail["/usr/lib/sendmail -t"] default
 
-		// skip unavailable default programs
-		if(no<0 && !file_executable(*file_spec))
-			continue;
-
-		String in(pool, letter_cstr); String out(pool); String err(pool);
-		int exit_status=pa_exec(*file_spec,
-			0/*default env*/,
-			&argv,
-			in, out, err);
-		if(exit_status || err.size())
+	const char *sendmailkey_cstr="sendmail";
+	const String *sendmail_command;
+	if(mail_conf) {
+		if(Value *sendmail_value=static_cast<Value *>(mail_conf->get(String(pool, sendmailkey_cstr))))
+			sendmail_command=&sendmail_value->as_string();
+		else
 			throw Exception(0, 0,
 				&method_name,
-				"'%s' reported problem: %s (%d)",
-					file_spec->cstr(),
-					err.size()?err.cstr():"UNKNOWN", 
-					exit_status);
-		break;
+				"$"MAIN_CLASS_NAME":"MAIL_NAME".%s not defined", 
+				sendmailkey_cstr);
+	} else {
+		String *test=new(pool) String(pool, "/usr/sbin/sendmail");
+		if(!file_executable(*test))
+			test=new(pool) String(pool, "/usr/lib/sendmail");
+		test->APPEND_CONST(" -t");
+		sendmail_command=test;
+	}
+
+	// we know sendmail_command here
+	Array argv(pool);
+	const String *file_spec;
+	int after_file_spec=sendmail_command->pos(" ", 1);
+	if(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::UL_AS_IS);
 	}
+
+	if(!file_executable(*file_spec))
+		throw Exception(0, 0,
+			file_spec,
+			"is not executable. Set $"MAIN_CLASS_NAME":"MAIL_NAME".%s with appropriate sendmail command", 
+				sendmailkey_cstr);
+
+	String in(pool, letter_cstr); String out(pool); String err(pool);
+	int exit_status=pa_exec(*file_spec,
+		0/*default env*/,
+		&argv,
+		in, out, err);
+	if(exit_status || err.size())
+		throw Exception(0, 0,
+			&method_name,
+			"'%s' reported problem: %s (%d)",
+				file_spec->cstr(),
+				err.size()?err.cstr():"UNKNOWN", 
+				exit_status);
 #endif
 }