--- parser3/src/classes/mail.C 2001/04/10 06:57:21 1.11 +++ parser3/src/classes/mail.C 2001/04/10 07:27:53 1.12 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: mail.C,v 1.11 2001/04/10 06:57:21 paf Exp $ + $Id: mail.C,v 1.12 2001/04/10 07:27:53 paf Exp $ */ #include "pa_config_includes.h" @@ -18,6 +18,7 @@ #include "pa_common.h" #include "pa_request.h" #include "pa_vfile.h" +#include "pa_exec.h" // global var @@ -272,12 +273,13 @@ static const String& letter_hash_to_stri return result; } -/// @test unix ver static void sendmail(Request& r, const String& method_name, const String& letter, const String *from, const String *to) { Pool& pool=r.pool(); + char *letter_cstr=letter.cstr(); + #ifdef WIN32 if(!from) PTHROW(0, 0, @@ -288,7 +290,6 @@ static void sendmail(Request& r, const S &method_name, "not specified 'to'"); - char *letter_cstr=letter.cstr(); SMTP& smtp=*new(pool) SMTP(pool, method_name); Value *server_port; // $MAIN:MAIL.SMTP[mail.design.ru] @@ -306,9 +307,49 @@ static void sendmail(Request& r, const S &method_name, "$MAIN:MAIL.SMTP not defined"); #else - PTHROW(0, 0, - &method_name, - "todo"); + // unix + // $MAIN:MAIL.SMTP[mail.design.ru] + if(r.mail) { + int no=0; + char no_cstr[MAX_NUMBER]; + while(true) { + snprintf(no_cstr, MAX_NUMBER, "%d", ++no); + String prog_key(pool, "prog"); prog_key << no_cstr; + if(Value *prog_value=static_cast(r.mail->get(prog_key))) { + // "/usr/sbin/sendmail -t" + const String& prog_string=prog_value->as_string(); + 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_CLEAN); + } + + 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()) + PTHROW(0, 0, + &method_name, + "'%s' reported problem: %s (%d)", + file_spec->cstr(), + err.size()?err.cstr():"UNKNOWN", + exit_status); + } else + PTHROW(0, 0, + &method_name, + "$MAIN:MAIL.%s not defined", prog_key.cstr()); + } + } else + PTHROW(0, 0, + &method_name, + "$MAIN:MAIL not defined"); #endif }