X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=7142fbdcc8c7cad594991b4e9ec116afa790c477;hp=ceab41b4062cbe002c909fa67f31935d14f2af1b;hb=e518a71f587454ec71cbdd6b37246f77235d4143;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index ceab41b..7142fbd 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -10,25 +10,18 @@
  * 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 <lib-ui/enter.h>
 
 #include "mutt.h"
-#include "enter.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>
 
@@ -95,7 +88,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;
 
@@ -151,7 +144,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);
@@ -165,7 +158,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;
@@ -255,7 +248,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;
 
@@ -274,7 +267,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);
@@ -286,10 +279,10 @@ 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;
-  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);
@@ -304,8 +297,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 */
@@ -395,8 +388,7 @@ int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
   }
 
 Done:
-  if (fp != NULL)
-    fclose (fp);
+  m_fclose(&fp);
   if (hostportstr != NULL)
     p_delete(&hostportstr);
   if (session != NULL)