Use p_new instead of xmalloc()

[apps/madmutt.git] / mutt_libesmtp.c

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 9df7ffb..e8786d9 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-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>
@@ -106,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;
 
@@ -144,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);
@@ -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') {
-      m_strcpy(p - 1, "\r\n");
+      m_strcpy(p - 1, (char *) *buf + BUFLEN - p + 1, "\r\n");
       p++;
     }
     octets = p - (char *) *buf;
@@ -179,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;