X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=eda907e21ec81557b295326f2dbb295105b0be01;hp=50a6f867882803ad240045e97141151ec11b9356;hb=21f4fef0f77a6caf41c6f8a15279b2b4e50a2f1a;hpb=40dd9fd7dc4b67d43d056aef865b79624ac6bc70 diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c index 50a6f86..eda907e 100644 --- a/mutt_libesmtp.c +++ b/mutt_libesmtp.c @@ -10,24 +10,19 @@ * It's licensed under the GNU General Public License, * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -#include "config.h" -#endif -#include "mutt.h" -#include "ascii.h" -#include "enter.h" +#include -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" +#include +#include + +#include "mutt.h" +#include "mutt_libesmtp.h" #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H)) #include #endif -#include - #include #include @@ -94,7 +89,7 @@ static void _mutt_libesmtp_perror (const char *msg) * Very similar to sendlib.c::add_args */ static int -_mutt_libesmtp_add_recipients (smtp_message_t message, ADDRESS * addr) +_mutt_libesmtp_add_recipients (smtp_message_t message, address_t * addr) { int ret = 0; @@ -112,7 +107,8 @@ Done: static int _mutt_libesmtp_auth_interact (auth_client_request_t request, - char **result, int fields, void *arg) + char **result, int fields, + void *arg __attribute__ ((unused))) { int i; @@ -150,7 +146,7 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len, int octets; if (*buf == NULL) - *buf = malloc (BUFLEN); + *buf = xmalloc(BUFLEN); if (len == NULL) { rewind ((FILE *) arg); @@ -164,7 +160,7 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len, char *p = strchr (*buf, '\0'); if (p[-1] == '\n' && p[-2] != '\r') { - strcpy (p - 1, "\r\n"); + m_strcpy(p - 1, (char *) *buf + BUFLEN - p + 1, "\r\n"); p++; } octets = p - (char *) *buf; @@ -185,7 +181,8 @@ static int handle_invalid_peer_certificate (long vfy_result) { return 1; /* Accept the problem */ } -static void event_cb (smtp_session_t session, int event_no, void *arg,...) +static void event_cb (smtp_session_t session __attribute__ ((unused)), + int event_no, void *arg,...) { va_list alist; int *ok; @@ -254,15 +251,15 @@ static void do_dsn_notify (smtp_message_t message, const char* from) { int flags = Notify_NOTSET; smtp_recipient_t self = NULL; - if (!DsnNotify || !*DsnNotify || !message || !from || !*from || - strstr (DsnNotify, "never") != NULL) + if (m_strisempty(MTransport.dsn_notify) || !message || m_strisempty(from) || + strstr (MTransport.dsn_notify, "never") != NULL) return; - if (strstr (DsnNotify, "failure") != NULL) + if (strstr (MTransport.dsn_notify, "failure") != NULL) flags |= Notify_FAILURE; - if (strstr (DsnNotify, "delay") != NULL) + if (strstr (MTransport.dsn_notify, "delay") != NULL) flags |= Notify_DELAY; - if (strstr (DsnNotify, "success") != NULL) + if (strstr (MTransport.dsn_notify, "success") != NULL) flags |= Notify_SUCCESS; if (flags != Notify_NOTSET) { @@ -273,22 +270,22 @@ static void do_dsn_notify (smtp_message_t message, const char* from) { } static void do_dsn_ret (smtp_message_t message) { - if (!DsnReturn || !*DsnReturn || !message) + if (m_strisempty(MTransport.dsn_return) || !message) return; - if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0) + if (ascii_strncasecmp (MTransport.dsn_return, "hdrs", 4) == 0) smtp_dsn_set_ret (message, Ret_HDRS); - else if (ascii_strncasecmp (DsnReturn, "full", 4) == 0) + else if (ascii_strncasecmp (MTransport.dsn_return, "full", 4) == 0) smtp_dsn_set_ret (message, Ret_FULL); } #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS)) int mutt_libesmtp_check_usetls (const char* option, unsigned long p, - char* errbuf, size_t errlen) { + char* errbuf, ssize_t errlen) { char* val = (char*) p; - if (!val || !*val) + if (m_strisempty(val)) return (1); - if (str_ncmp (val, "enabled", 7) != 0 && - str_ncmp (val, "required", 8) != 0) { + if (m_strncmp(val, "enabled", 7) != 0 && + m_strncmp(val, "required", 8) != 0) { if (errbuf) snprintf (errbuf, errlen, _("'%s' is invalid for %s"), val, option); return (0); @@ -303,8 +300,8 @@ int mutt_libesmtp_check_usetls (const char* option, unsigned long p, * Returns 0 upon success, -1 upon failure (and prints an error * message). */ -int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */ - ADDRESS * to, ADDRESS * cc, ADDRESS * bcc, /* recips */ +int mutt_libesmtp_invoke (address_t * from, /* the sender */ + address_t * to, address_t * cc, address_t * bcc, /* recips */ const char *msg, /* file containing message */ int eightbit) { /* message contains 8bit chars */ @@ -333,8 +330,8 @@ int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */ /* Create hostname:port string and tell libesmtp */ /* len = SmtpHost len + colon + max port (65536 => 5 chars) + terminator */ - hostportlen = str_len (SmtpHost) + 7; - hostportstr = mem_malloc (hostportlen); + hostportlen = m_strlen(SmtpHost) + 7; + hostportstr = p_new(char, hostportlen); snprintf (hostportstr, hostportlen, "%s:%d", SmtpHost, SmtpPort); if (!smtp_set_server (session, hostportstr)) SMTPFAIL ("smtp_set_server"); @@ -358,8 +355,8 @@ int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */ SMTPFAIL ("smtp_add_message"); /* Initialize envelope sender */ - if (SmtpEnvFrom && *SmtpEnvFrom) - envfrom = SmtpEnvFrom; + if (MTransport.use_envelope_from && MTransport.envelope_from_address) + envfrom = MTransport.envelope_from_address->mailbox; if (!smtp_set_reverse_path (message, envfrom)) SMTPFAIL ("smtp_set_reverse_path"); @@ -368,7 +365,7 @@ int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */ do_dsn_ret (message); /* set up 8bitmime flag */ - if (eightbit && option (OPTUSE8BITMIME)) + if (eightbit && MTransport.use_8bitmime) smtp_8bitmime_set_body (message, E8bitmime_8BITMIME); if ((fp = fopen (msg, "r")) == NULL) @@ -394,10 +391,9 @@ int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */ } Done: - if (fp != NULL) - fclose (fp); + m_fclose(&fp); if (hostportstr != NULL) - free (hostportstr); + p_delete(&hostportstr); if (session != NULL) smtp_destroy_session (session); if (authctx != NULL)