X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=ba6b4227b61d68877be5298655917a9d7d99d560;hp=9bf63f8edc30ae1586ccf9f0ba9e61209ce560d0;hb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/charset.c b/charset.c
index 9bf63f8..ba6b422 100644
--- a/charset.c
+++ b/charset.c
@@ -23,14 +23,13 @@
 #include <errno.h>
 
 #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 "ascii.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #ifndef EILSEQ
 # define EILSEQ EINVAL
@@ -194,19 +193,19 @@ void mutt_set_langinfo_charset (void)
   char buff[LONG_STRING];
   char buff2[LONG_STRING];
 
-  strfcpy (buff, nl_langinfo (CODESET), sizeof (buff));
+  m_strcpy(buff, sizeof(buff), nl_langinfo(CODESET));
   mutt_canonical_charset (buff2, sizeof (buff2), buff);
 
   /* finally, set $charset */
-  if (!(Charset = str_dup (buff2)))
-    Charset = str_dup ("iso-8859-1");
+  if (!(Charset = m_strdup(buff2)))
+    Charset = m_strdup("iso-8859-1");
 }
 
 #else
 
 void mutt_set_langinfo_charset (void)
 {
-  Charset = str_dup ("iso-8859-1");
+  Charset = m_strdup("iso-8859-1");
 }
 
 #endif
@@ -227,16 +226,16 @@ void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
   else if (!ascii_strncasecmp (name, "iso8859-", 8))
     snprintf (scratch, sizeof (scratch), "iso_8859-%s", name + 8);
   else
-    strfcpy (scratch, NONULL (name), sizeof (scratch));
+    m_strcpy(scratch, sizeof(scratch), NONULL(name));
 
   for (i = 0; PreferredMIMENames[i].key; i++)
     if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
-        !str_casecmp (scratch, PreferredMIMENames[i].key)) {
-      strfcpy (dest, PreferredMIMENames[i].pref, dlen);
+        !m_strcasecmp(scratch, PreferredMIMENames[i].key)) {
+      m_strcpy(dest, dlen, PreferredMIMENames[i].pref);
       return;
     }
 
-  strfcpy (dest, scratch, dlen);
+  m_strcpy(dest, dlen, scratch);
 
   /* for cosmetics' sake, transform to lowercase. */
   for (p = dest; *p; p++)
@@ -317,7 +316,7 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
 
         for (t = inrepls; *t; t++) {
           const char *ib1 = *t;
-          size_t ibl1 = str_len (*t);
+          size_t ibl1 = m_strlen(*t);
           char *ob1 = ob;
           size_t obl1 = obl;
 
@@ -337,7 +336,7 @@ size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
         outrepl = "?";
       my_iconv(cd, 0, 0, &ob, &obl);
       if (obl) {
-        int n = str_len (outrepl);
+        size_t n = m_strlen(outrepl);
 
         if (n > obl) {
           outrepl = "?";
@@ -388,7 +387,7 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
     else
       outrepl = "?";
 
-    len = str_len (s);
+    len = m_strlen(s);
     ib = s, ibl = len + 1;
     obl = MB_LEN_MAX * ibl;
     ob = buf = xmalloc(obl + 1);
@@ -400,8 +399,6 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
 
     p_delete(ps);
     *ps = buf;
-
-    str_adjust (ps);
     return 0;
   }
   else
@@ -449,7 +446,7 @@ FGETCONV *fgetconv_open (FILE * file, const char *from, const char *to,
     fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
   }
   else
-    fc = p_new(struct fgetconv_not, 1);
+    fc = p_new(struct fgetconv_s, 1);
   fc->file = file;
   fc->cd = cd;
   return (FGETCONV *) fc;
@@ -543,11 +540,11 @@ const char *mutt_get_first_charset (const char *charset)
   const char *c, *c1;
 
   c = charset;
-  if (!str_len (c))
+  if (!m_strlen(c))
     return "us-ascii";
   if (!(c1 = strchr (c, ':')))
     return ((char*) charset);
-  strfcpy (fcharset, c, c1 - c + 1);
+  m_strcpy(fcharset, c1 - c + 1, c);
   return fcharset;
 }
 
@@ -557,7 +554,8 @@ static size_t convert_string (const char *f, size_t flen,
 {
   iconv_t cd;
   char *buf, *ob;
-  size_t obl, n;
+  size_t obl;
+  ssize_t n;
   int e;
 
   cd = mutt_iconv_open (to, from, 0);
@@ -566,7 +564,7 @@ static size_t convert_string (const char *f, size_t flen,
   obl = 4 * flen + 1;
   ob = buf = xmalloc(obl);
   n = my_iconv(cd, &f, &flen, &ob, &obl);
-  if (n == (size_t) (-1) || my_iconv(cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
+  if (n < 0 || my_iconv(cd, 0, 0, &ob, &obl) < 0) {
     e = errno;
     p_delete(&buf);
     iconv_close (cd);
@@ -577,7 +575,7 @@ static size_t convert_string (const char *f, size_t flen,
 
   *tlen = ob - buf;
 
-  mem_realloc (&buf, ob - buf + 1);
+  p_realloc(&buf, ob - buf + 1);
   *t = buf;
   iconv_close (cd);
 
@@ -593,14 +591,14 @@ int mutt_convert_nonmime_string (char **ps)
     char *s = NULL;
     char *fromcode;
     size_t m, n;
-    size_t ulen = str_len (*ps);
+    size_t ulen = m_strlen(*ps);
     size_t slen;
 
     if (!u || !*u)
       return 0;
 
     c1 = strchr (c, ':');
-    n = c1 ? c1 - c : str_len (c);
+    n = c1 ? c1 - c : m_strlen(c);
     if (!n)
       continue;
     fromcode = p_dupstr(c, n);