Fix compilation warnings

[apps/madmutt.git] / mutt_libesmtp.c

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 7b3ada3..e8786d9 100644 (file)
--- 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 <lib-lib/lib-lib.h>
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.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
 
-#include <errno.h>
-
 #include <auth-client.h>
 #include <libesmtp.h>
 
@@ -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;
@@ -174,16 +170,19 @@ static const char *_mutt_libesmtp_messagefp_cb (void **buf, int *len,
   return *buf;
 }
 
-#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
 static int handle_invalid_peer_certificate (long vfy_result) {
+#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
   mutt_error (_("Error verifying certificate: %s"),
               NONULL (X509_verify_cert_error_string (vfy_result)));
+#else
+  mutt_error (_("Error verifying certificate. Error Code: %lu"), vfy_result);
+#endif
   sleep(2);
   return 1; /* Accept the problem */
 }
-#endif
 
-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;
@@ -252,7 +251,7 @@ 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 || 
+  if (m_strisempty(DsnNotify) || !message || m_strisempty(from) || 
       strstr (DsnNotify, "never") != NULL)
     return;
 
@@ -271,7 +270,7 @@ 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(DsnReturn) || !message)
     return;
   if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
     smtp_dsn_set_ret (message, Ret_HDRS);
@@ -280,10 +279,17 @@ static void do_dsn_ret (smtp_message_t message) {
 }
 
 #if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-int mutt_libesmtp_check_usetls (const char* val) {
-  if (str_ncmp (val, "enabled", 7) != 0 &&
-      str_ncmp (val, "required", 8) != 0)
+int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
+                                char* errbuf, size_t errlen) {
+  char* val = (char*) p;
+  if (m_strisempty(val))
+    return (1);
+  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);
+  }
   return (1);
 }
 #endif
@@ -294,8 +300,8 @@ int mutt_libesmtp_check_usetls (const char* val) {
  *   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 */
@@ -324,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");
@@ -349,8 +355,8 @@ int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
     SMTPFAIL ("smtp_add_message");
 
   /*  Initialize envelope sender */
-  if (SmtpEnvFrom && *SmtpEnvFrom)
-    envfrom = SmtpEnvFrom;
+  if (option (OPTENVFROM) && EnvFrom)
+    envfrom = EnvFrom->mailbox;
   if (!smtp_set_reverse_path (message, envfrom))
     SMTPFAIL ("smtp_set_reverse_path");
 
@@ -385,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)