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
3ffb3f0
..
c77d4d2
100644
(file)
--- a/
mutt_libesmtp.c
+++ b/
mutt_libesmtp.c
@@
-14,9
+14,10
@@
#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
#include <lib-lib/lib-lib.h>
#include <lib-ui/enter.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "mutt.h"
-
+#include "mutt_libesmtp.h"
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
@@
-106,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;
@@
-158,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') {
- m_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;
@@
-179,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;
@@
-352,8
+355,8
@@
int mutt_libesmtp_invoke (address_t * 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");
@@
-362,7
+365,7
@@
int mutt_libesmtp_invoke (address_t * 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)