X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=91a33497d2249d5583810147d8d2d6e3e82be0b8;hp=4b42e32e42025238d8b94c30d5d7661264d95fc1;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/mutt_idna.c b/mutt_idna.c
index 4b42e32..91a3349 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -11,13 +11,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "charset.h"
 #include "mutt_idna.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 /* The low-level interface we use. */
@@ -26,13 +28,13 @@
 
 int mutt_idna_to_local (const char *in, char **out, int flags)
 {
-  *out = str_dup (in);
+  *out = m_strdup(in);
   return 1;
 }
 
 int mutt_local_to_idna (const char *in, char **out)
 {
-  *out = str_dup (in);
+  *out = m_strdup(in);
   return 0;
 }
 
@@ -62,7 +64,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
   if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
     int irrev = 0;
     char *t2 = NULL;
-    char *tmp = str_dup (*out);
+    char *tmp = m_strdup(*out);
 
     if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
       irrev = 1;
@@ -73,8 +75,8 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
       irrev = 1;
     }
 
-    FREE (&t2);
-    FREE (&tmp);
+    p_delete(&t2);
+    p_delete(&tmp);
 
     if (irrev)
       goto notrans;
@@ -83,15 +85,15 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
   return 0;
 
 notrans:
-  FREE (out);
-  *out = str_dup (in);
+  p_delete(out);
+  *out = m_strdup(in);
   return 1;
 }
 
 int mutt_local_to_idna (const char *in, char **out)
 {
   int rv = 0;
-  char *tmp = str_dup (in);
+  char *tmp = m_strdup(in);
 
   *out = NULL;
 
@@ -105,10 +107,10 @@ int mutt_local_to_idna (const char *in, char **out)
   if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
     rv = -2;
 
-  FREE (&tmp);
+  p_delete(&tmp);
   if (rv < 0) {
-    FREE (out);
-    *out = str_dup (in);
+    p_delete(out);
+    *out = m_strdup(in);
   }
   return rv;
 }
@@ -126,11 +128,10 @@ static int mbox_to_udomain (const char *mbx, char **user, char **domain)
   *domain = NULL;
 
   p = strchr (mbx, '@');
-  if (!p)
+  if (!p || !p[1])
     return -1;
-  *user = safe_calloc ((p - mbx + 1), sizeof (mbx[0]));
-  strfcpy (*user, mbx, (p - mbx + 1));
-  *domain = str_dup (p + 1);
+  *user = p_dupstr(mbx, p - mbx);
+  *domain = m_strdup(p + 1);
   return 0;
 }
 
@@ -152,16 +153,16 @@ int mutt_addrlist_to_idna (ADDRESS * a, char **err)
     if (mutt_local_to_idna (domain, &tmp) < 0) {
       e = 1;
       if (err)
-        *err = str_dup (domain);
+        *err = m_strdup(domain);
     }
     else {
-      safe_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+      p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
-    FREE (&domain);
-    FREE (&user);
-    FREE (&tmp);
+    p_delete(&domain);
+    p_delete(&user);
+    p_delete(&tmp);
 
     if (e)
       return -1;
@@ -182,13 +183,13 @@ int mutt_addrlist_to_local (ADDRESS * a)
       continue;
 
     if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
-      safe_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+      p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
-    FREE (&domain);
-    FREE (&user);
-    FREE (&tmp);
+    p_delete(&domain);
+    p_delete(&user);
+    p_delete(&tmp);
   }
 
   return 0;
@@ -205,22 +206,22 @@ const char *mutt_addr_for_display (ADDRESS * a)
   char *domain = NULL;
   char *user = NULL;
 
-  FREE (&buff);
+  p_delete(&buff);
 
   if (mbox_to_udomain (a->mailbox, &user, &domain) != 0)
     return a->mailbox;
   if (mutt_idna_to_local (domain, &tmp, MI_MAY_BE_IRREVERSIBLE) != 0) {
-    FREE (&user);
-    FREE (&domain);
-    FREE (&tmp);
+    p_delete(&user);
+    p_delete(&domain);
+    p_delete(&tmp);
     return a->mailbox;
   }
 
-  safe_realloc (&buff, str_len (tmp) + str_len (user) + 2);
+  p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
   sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
-  FREE (&tmp);
-  FREE (&user);
-  FREE (&domain);
+  p_delete(&tmp);
+  p_delete(&user);
+  p_delete(&domain);
   return buff;
 }
 
@@ -247,7 +248,7 @@ void mutt_env_to_local (ENVELOPE * e)
      if (tag) *tag = #a; e = 1; err = NULL; \
   }
 
-int mutt_env_to_idna (ENVELOPE * env, char **tag, char **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, const char **err)
 {
   int e = 0;