projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify some mime things
[apps/madmutt.git]
/
mutt_libesmtp.c
diff --git
a/mutt_libesmtp.c
b/mutt_libesmtp.c
index
11ea993
..
c77d4d2
100644
(file)
--- a/
mutt_libesmtp.c
+++ b/
mutt_libesmtp.c
@@
-10,25
+10,19
@@
* It's licensed under the GNU General Public License,
* please see the file GPL in the top level source directory.
*/
* 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 <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
-#include
"mutt.h"
-#include
"enter.h"
+#include
<lib-ui/enter.h>
+#include
<lib-ui/curses.h>
+#include "mutt.h"
+#include "mutt_libesmtp.h"
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
#endif
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
#endif
-#include <errno.h>
-
#include <auth-client.h>
#include <libesmtp.h>
#include <auth-client.h>
#include <libesmtp.h>
@@
-95,7
+89,7
@@
static void _mutt_libesmtp_perror (const char *msg)
* Very similar to sendlib.c::add_args
*/
static int
* 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;
{
int ret = 0;
@@
-113,7
+107,8
@@
Done:
static int
_mutt_libesmtp_auth_interact (auth_client_request_t request,
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;
{
int i;
@@
-151,7
+146,7
@@
static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len,
int octets;
if (*buf == NULL)
int octets;
if (*buf == NULL)
- *buf =
malloc
(BUFLEN);
+ *buf =
xmalloc
(BUFLEN);
if (len == NULL) {
rewind ((FILE *) arg);
if (len == NULL) {
rewind ((FILE *) arg);
@@
-165,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') {
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;
p++;
}
octets = p - (char *) *buf;
@@
-186,7
+181,8
@@
static int handle_invalid_peer_certificate (long vfy_result) {
return 1; /* Accept the problem */
}
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;
{
va_list alist;
int *ok;
@@
-255,7
+251,7
@@
static void do_dsn_notify (smtp_message_t message, const char* from) {
int flags = Notify_NOTSET;
smtp_recipient_t self = NULL;
int flags = Notify_NOTSET;
smtp_recipient_t self = NULL;
- if (
!DsnNotify || !*DsnNotify || !message || !from || !*from
||
+ if (
m_strisempty(DsnNotify) || !message || m_strisempty(from)
||
strstr (DsnNotify, "never") != NULL)
return;
strstr (DsnNotify, "never") != NULL)
return;
@@
-274,7
+270,7
@@
static void do_dsn_notify (smtp_message_t message, const char* from) {
}
static void do_dsn_ret (smtp_message_t message) {
}
static void do_dsn_ret (smtp_message_t message) {
- if (
!DsnReturn || !*DsnReturn
|| !message)
+ if (
m_strisempty(DsnReturn)
|| !message)
return;
if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
smtp_dsn_set_ret (message, Ret_HDRS);
return;
if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
smtp_dsn_set_ret (message, Ret_HDRS);
@@
-286,7
+282,7
@@
static void do_dsn_ret (smtp_message_t message) {
int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
char* errbuf, size_t errlen) {
char* val = (char*) p;
int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
char* errbuf, size_t errlen) {
char* val = (char*) p;
- if (
!val || !*val
)
+ if (
m_strisempty(val)
)
return (1);
if (m_strncmp(val, "enabled", 7) != 0 &&
m_strncmp(val, "required", 8) != 0) {
return (1);
if (m_strncmp(val, "enabled", 7) != 0 &&
m_strncmp(val, "required", 8) != 0) {
@@
-304,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).
*/
* 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 */
const char *msg, /* file containing message */
int eightbit)
{ /* message contains 8bit chars */
@@
-359,8
+355,8
@@
int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
- if (
option (OPTENVFROM) && EnvFrom
)
- envfrom =
EnvFrom
->mailbox;
+ if (
MTransport.use_envelope_fromoption && MTransport.envelope_from_address
)
+ envfrom =
MTransport.envelope_from_address
->mailbox;
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
@@
-369,7
+365,7
@@
int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */
do_dsn_ret (message);
/* set up 8bitmime flag */
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)
smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
if ((fp = fopen (msg, "r")) == NULL)
@@
-395,8
+391,7
@@
int mutt_libesmtp_invoke (ADDRESS * from, /* the sender */
}
Done:
}
Done:
- if (fp != NULL)
- fclose (fp);
+ m_fclose(&fp);
if (hostportstr != NULL)
p_delete(&hostportstr);
if (session != NULL)
if (hostportstr != NULL)
p_delete(&hostportstr);
if (session != NULL)