X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.c;h=ba6b4227b61d68877be5298655917a9d7d99d560;hp=4bae3083bc42ed4258903ad9299afdcd34dc668b;hb=35e39caa19fa050a934e49c1df516cec19c3a4bf;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/charset.c b/charset.c
index 4bae308..ba6b422 100644
--- a/charset.c
+++ b/charset.c
@@ -22,12 +22,14 @@
 #include <unistd.h>
 #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 "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #ifndef EILSEQ
 # define EILSEQ EINVAL
@@ -43,8 +45,8 @@
  */
 
 static struct {
-  char *key;
-  char *pref;
+  const char *key;
+  const char *pref;
 } PreferredMIMENames[] = {
   {
   "ansi_x3.4-1968", "us-ascii"}, {
@@ -123,7 +125,7 @@ static struct {
   "latin6", "iso-8859-10"},     /* this is not a bug */
   {
   "l6", "iso-8859-10"}, {
-  "csISOLatin6" "iso-8859-10"}, {
+  "csISOLatin6", "iso-8859-10"}, {
   "csKOI8r", "koi8-r"}, {
   "MS_Kanji", "Shift_JIS"},     /* Note the underscore! */
   {
@@ -191,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 = safe_strdup (buff2)))
-    Charset = safe_strdup ("iso-8859-1");
+  if (!(Charset = m_strdup(buff2)))
+    Charset = m_strdup("iso-8859-1");
 }
 
 #else
 
 void mutt_set_langinfo_charset (void)
 {
-  Charset = safe_strdup ("iso-8859-1");
+  Charset = m_strdup("iso-8859-1");
 }
 
 #endif
@@ -224,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) ||
-        !safe_strcasecmp (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++)
@@ -252,27 +254,6 @@ int mutt_chscmp (const char *s, const char *chs)
 }
 
 
-#ifndef HAVE_ICONV
-
-iconv_t iconv_open (const char *tocode, const char *fromcode)
-{
-  return (iconv_t) (-1);
-}
-
-size_t iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
-              char **outbuf, size_t * outbytesleft)
-{
-  return 0;
-}
-
-int iconv_close (iconv_t cd)
-{
-  return 0;
-}
-
-#endif /* !HAVE_ICONV */
-
-
 /*
  * Like iconv_open, but canonicalises the charsets
  */
@@ -314,32 +295,32 @@ iconv_t mutt_iconv_open (const char *tocode, const char *fromcode, int flags)
  * if you're supplying an outrepl, the target charset should be.
  */
 
-size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
+size_t mutt_iconv (iconv_t cd, const char **inbuf, size_t * inbytesleft,
                    char **outbuf, size_t * outbytesleft,
-                   ICONV_CONST char **inrepls, const char *outrepl)
+                   const char **inrepls, const char *outrepl)
 {
   size_t ret = 0, ret1;
-  ICONV_CONST char *ib = *inbuf;
+  const char *ib = *inbuf;
   size_t ibl = *inbytesleft;
   char *ob = *outbuf;
   size_t obl = *outbytesleft;
 
   for (;;) {
-    ret1 = iconv (cd, &ib, &ibl, &ob, &obl);
+    ret1 = my_iconv(cd, &ib, &ibl, &ob, &obl);
     if (ret1 != (size_t) - 1)
       ret += ret1;
     if (ibl && obl && errno == EILSEQ) {
       if (inrepls) {
         /* Try replacing the input */
-        ICONV_CONST char **t;
+        const char **t;
 
         for (t = inrepls; *t; t++) {
-          ICONV_CONST char *ib1 = *t;
-          size_t ibl1 = safe_strlen (*t);
+          const char *ib1 = *t;
+          size_t ibl1 = m_strlen(*t);
           char *ob1 = ob;
           size_t obl1 = obl;
 
-          iconv (cd, &ib1, &ibl1, &ob1, &obl1);
+          my_iconv(cd, &ib1, &ibl1, &ob1, &obl1);
           if (!ibl1) {
             ++ib, --ibl;
             ob = ob1, obl = obl1;
@@ -353,9 +334,9 @@ size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
       /* Replace the output */
       if (!outrepl)
         outrepl = "?";
-      iconv (cd, 0, 0, &ob, &obl);
+      my_iconv(cd, 0, 0, &ob, &obl);
       if (obl) {
-        int n = safe_strlen (outrepl);
+        size_t n = m_strlen(outrepl);
 
         if (n > obl) {
           outrepl = "?";
@@ -365,7 +346,7 @@ size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
         ++ib, --ibl;
         ob += n, obl -= n;
         ++ret;
-        iconv (cd, 0, 0, 0, 0); /* for good measure */
+        my_iconv(cd, 0, 0, 0, 0); /* for good measure */
         continue;
       }
     }
@@ -385,7 +366,7 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
                          int flags)
 {
   iconv_t cd;
-  ICONV_CONST char *repls[] = { "\357\277\275", "?", 0 };
+  const char *repls[] = { "\357\277\275", "?", 0 };
   char *s = *ps;
 
   if (!s || !*s)
@@ -393,11 +374,11 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
 
   if (to && from && (cd = mutt_iconv_open (to, from, flags)) != (iconv_t) - 1) {
     int len;
-    ICONV_CONST char *ib;
+    const char *ib;
     char *buf, *ob;
     size_t ibl, obl;
-    ICONV_CONST char **inrepls = 0;
-    char *outrepl = 0;
+    const char **inrepls = NULL;
+    const char *outrepl = NULL;
 
     if (mutt_is_utf8 (to))
       outrepl = "\357\277\275";
@@ -406,20 +387,18 @@ int mutt_convert_string (char **ps, const char *from, const char *to,
     else
       outrepl = "?";
 
-    len = safe_strlen (s);
+    len = m_strlen(s);
     ib = s, ibl = len + 1;
     obl = MB_LEN_MAX * ibl;
-    ob = buf = safe_malloc (obl + 1);
+    ob = buf = xmalloc(obl + 1);
 
     mutt_iconv (cd, &ib, &ibl, &ob, &obl, inrepls, outrepl);
     iconv_close (cd);
 
     *ob = '\0';
 
-    FREE (ps);
+    p_delete(ps);
     *ps = buf;
-
-    str_adjust (ps);
     return 0;
   }
   else
@@ -441,7 +420,7 @@ struct fgetconv_s {
   char *ob;
   char *ib;
   size_t ibl;
-  ICONV_CONST char **inrepls;
+  const char **inrepls;
 };
 
 struct fgetconv_not {
@@ -454,20 +433,20 @@ FGETCONV *fgetconv_open (FILE * file, const char *from, const char *to,
 {
   struct fgetconv_s *fc;
   iconv_t cd = (iconv_t) - 1;
-  static ICONV_CONST char *repls[] = { "\357\277\275", "?", 0 };
+  static const char *repls[] = { "\357\277\275", "?", 0 };
 
   if (from && to)
     cd = mutt_iconv_open (to, from, flags);
 
   if (cd != (iconv_t) - 1) {
-    fc = safe_malloc (sizeof (struct fgetconv_s));
+    fc = p_new(struct fgetconv_s, 1);
     fc->p = fc->ob = fc->bufo;
     fc->ib = fc->bufi;
     fc->ibl = 0;
     fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
   }
   else
-    fc = safe_malloc (sizeof (struct fgetconv_not));
+    fc = p_new(struct fgetconv_s, 1);
   fc->file = file;
   fc->cd = cd;
   return (FGETCONV *) fc;
@@ -511,7 +490,7 @@ int fgetconv (FGETCONV * _fc)
   if (fc->ibl) {
     size_t obl = sizeof (fc->bufo);
 
-    iconv (fc->cd, (ICONV_CONST char **) &fc->ib, &fc->ibl, &fc->ob, &obl);
+    my_iconv(fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob, &obl);
     if (fc->p < fc->ob)
       return (unsigned char) *(fc->p)++;
   }
@@ -535,7 +514,7 @@ int fgetconv (FGETCONV * _fc)
   if (fc->ibl) {
     size_t obl = sizeof (fc->bufo);
 
-    mutt_iconv (fc->cd, (ICONV_CONST char **) &fc->ib, &fc->ibl, &fc->ob,
+    mutt_iconv (fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob,
                 &obl, fc->inrepls, 0);
     if (fc->p < fc->ob)
       return (unsigned char) *(fc->p)++;
@@ -552,41 +531,42 @@ void fgetconv_close (FGETCONV ** _fc)
 
   if (fc->cd != (iconv_t) - 1)
     iconv_close (fc->cd);
-  FREE (_fc);
+  p_delete(_fc);
 }
 
-char *mutt_get_first_charset (const char *charset)
+const char *mutt_get_first_charset (const char *charset)
 {
   static char fcharset[SHORT_STRING];
   const char *c, *c1;
 
   c = charset;
-  if (!safe_strlen (c))
+  if (!m_strlen(c))
     return "us-ascii";
   if (!(c1 = strchr (c, ':')))
-    return charset;
-  strfcpy (fcharset, c, c1 - c + 1);
+    return ((char*) charset);
+  m_strcpy(fcharset, c1 - c + 1, c);
   return fcharset;
 }
 
-static size_t convert_string (ICONV_CONST char *f, size_t flen,
+static size_t convert_string (const char *f, size_t flen,
                               const char *from, const char *to,
                               char **t, size_t * tlen)
 {
   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);
   if (cd == (iconv_t) (-1))
     return (size_t) (-1);
   obl = 4 * flen + 1;
-  ob = buf = safe_malloc (obl);
-  n = iconv (cd, &f, &flen, &ob, &obl);
-  if (n == (size_t) (-1) || iconv (cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
+  ob = buf = xmalloc(obl);
+  n = my_iconv(cd, &f, &flen, &ob, &obl);
+  if (n < 0 || my_iconv(cd, 0, 0, &ob, &obl) < 0) {
     e = errno;
-    FREE (&buf);
+    p_delete(&buf);
     iconv_close (cd);
     errno = e;
     return (size_t) (-1);
@@ -595,7 +575,7 @@ static size_t convert_string (ICONV_CONST char *f, size_t flen,
 
   *tlen = ob - buf;
 
-  safe_realloc (&buf, ob - buf + 1);
+  p_realloc(&buf, ob - buf + 1);
   *t = buf;
   iconv_close (cd);
 
@@ -608,25 +588,24 @@ int mutt_convert_nonmime_string (char **ps)
 
   for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
     char *u = *ps;
-    char *s;
+    char *s = NULL;
     char *fromcode;
     size_t m, n;
-    size_t ulen = safe_strlen (*ps);
+    size_t ulen = m_strlen(*ps);
     size_t slen;
 
     if (!u || !*u)
       return 0;
 
     c1 = strchr (c, ':');
-    n = c1 ? c1 - c : safe_strlen (c);
+    n = c1 ? c1 - c : m_strlen(c);
     if (!n)
       continue;
-    fromcode = safe_malloc (n + 1);
-    strfcpy (fromcode, c, n + 1);
+    fromcode = p_dupstr(c, n);
     m = convert_string (u, ulen, fromcode, Charset, &s, &slen);
-    FREE (&fromcode);
+    p_delete(&fromcode);
     if (m != (size_t) (-1)) {
-      FREE (ps);
+      p_delete(ps);
       *ps = s;
       return 0;
     }