#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 "mutt.h"
-#include "ascii.h"
#include "enter.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
#include <openssl/ssl.h>
/* 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");
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");
if (fp != NULL)
fclose (fp);
if (hostportstr != NULL)
- free (hostportstr);
+ p_delete(&hostportstr);
if (session != NULL)
smtp_destroy_session (session);
if (authctx != NULL)