projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
charset.c
diff --git
a/charset.c
b/charset.c
index
46de91c
..
4f5700d
100644
(file)
--- a/
charset.c
+++ b/
charset.c
@@
-24,6
+24,7
@@
#include "mutt.h"
#include "charset.h"
#include "mutt.h"
#include "charset.h"
+#include "ascii.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/mem.h"
#include "lib/intl.h"
@@
-195,15
+196,15
@@
void mutt_set_langinfo_charset (void)
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
mutt_canonical_charset (buff2, sizeof (buff2), buff);
/* finally, set $charset */
- if (!(Charset = s
afe_str
dup (buff2)))
- Charset = s
afe_str
dup ("iso-8859-1");
+ if (!(Charset = s
tr_
dup (buff2)))
+ Charset = s
tr_
dup ("iso-8859-1");
}
#else
void mutt_set_langinfo_charset (void)
{
}
#else
void mutt_set_langinfo_charset (void)
{
- Charset = s
afe_str
dup ("iso-8859-1");
+ Charset = s
tr_
dup ("iso-8859-1");
}
#endif
}
#endif
@@
-228,7
+229,7
@@
void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
for (i = 0; PreferredMIMENames[i].key; i++)
if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
for (i = 0; PreferredMIMENames[i].key; i++)
if (!ascii_strcasecmp (scratch, PreferredMIMENames[i].key) ||
- !s
afe_str
casecmp (scratch, PreferredMIMENames[i].key)) {
+ !s
tr_
casecmp (scratch, PreferredMIMENames[i].key)) {
strfcpy (dest, PreferredMIMENames[i].pref, dlen);
return;
}
strfcpy (dest, PreferredMIMENames[i].pref, dlen);
return;
}
@@
-335,7
+336,7
@@
size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
for (t = inrepls; *t; t++) {
ICONV_CONST char *ib1 = *t;
for (t = inrepls; *t; t++) {
ICONV_CONST char *ib1 = *t;
- size_t ibl1 =
mutt_str
len (*t);
+ size_t ibl1 =
str_
len (*t);
char *ob1 = ob;
size_t obl1 = obl;
char *ob1 = ob;
size_t obl1 = obl;
@@
-355,7
+356,7
@@
size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
outrepl = "?";
iconv (cd, 0, 0, &ob, &obl);
if (obl) {
outrepl = "?";
iconv (cd, 0, 0, &ob, &obl);
if (obl) {
- int n =
mutt_str
len (outrepl);
+ int n =
str_
len (outrepl);
if (n > obl) {
outrepl = "?";
if (n > obl) {
outrepl = "?";
@@
-406,17
+407,17
@@
int mutt_convert_string (char **ps, const char *from, const char *to,
else
outrepl = "?";
else
outrepl = "?";
- len =
mutt_str
len (s);
+ len =
str_
len (s);
ib = s, ibl = len + 1;
obl = MB_LEN_MAX * ibl;
ib = s, ibl = len + 1;
obl = MB_LEN_MAX * ibl;
- ob = buf =
safe
_malloc (obl + 1);
+ ob = buf =
mem
_malloc (obl + 1);
mutt_iconv (cd, &ib, &ibl, &ob, &obl, inrepls, outrepl);
iconv_close (cd);
*ob = '\0';
mutt_iconv (cd, &ib, &ibl, &ob, &obl, inrepls, outrepl);
iconv_close (cd);
*ob = '\0';
-
FREE
(ps);
+
mem_free
(ps);
*ps = buf;
str_adjust (ps);
*ps = buf;
str_adjust (ps);
@@
-460,14
+461,14
@@
FGETCONV *fgetconv_open (FILE * file, const char *from, const char *to,
cd = mutt_iconv_open (to, from, flags);
if (cd != (iconv_t) - 1) {
cd = mutt_iconv_open (to, from, flags);
if (cd != (iconv_t) - 1) {
- fc =
safe
_malloc (sizeof (struct fgetconv_s));
+ fc =
mem
_malloc (sizeof (struct fgetconv_s));
fc->p = fc->ob = fc->bufo;
fc->ib = fc->bufi;
fc->ibl = 0;
fc->inrepls = mutt_is_utf8 (to) ? repls : repls + 1;
}
else
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 =
mem
_malloc (sizeof (struct fgetconv_not));
fc->file = file;
fc->cd = cd;
return (FGETCONV *) fc;
fc->file = file;
fc->cd = cd;
return (FGETCONV *) fc;
@@
-552,7
+553,7
@@
void fgetconv_close (FGETCONV ** _fc)
if (fc->cd != (iconv_t) - 1)
iconv_close (fc->cd);
if (fc->cd != (iconv_t) - 1)
iconv_close (fc->cd);
-
FREE
(_fc);
+
mem_free
(_fc);
}
char *mutt_get_first_charset (const char *charset)
}
char *mutt_get_first_charset (const char *charset)
@@
-561,7
+562,7
@@
char *mutt_get_first_charset (const char *charset)
const char *c, *c1;
c = charset;
const char *c, *c1;
c = charset;
- if (!
mutt_str
len (c))
+ if (!
str_
len (c))
return "us-ascii";
if (!(c1 = strchr (c, ':')))
return ((char*) charset);
return "us-ascii";
if (!(c1 = strchr (c, ':')))
return ((char*) charset);
@@
-582,11
+583,11
@@
static size_t convert_string (ICONV_CONST char *f, size_t flen,
if (cd == (iconv_t) (-1))
return (size_t) (-1);
obl = 4 * flen + 1;
if (cd == (iconv_t) (-1))
return (size_t) (-1);
obl = 4 * flen + 1;
- ob = buf =
safe
_malloc (obl);
+ ob = buf =
mem
_malloc (obl);
n = iconv (cd, &f, &flen, &ob, &obl);
if (n == (size_t) (-1) || iconv (cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
e = errno;
n = iconv (cd, &f, &flen, &ob, &obl);
if (n == (size_t) (-1) || iconv (cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
e = errno;
-
FREE
(&buf);
+
mem_free
(&buf);
iconv_close (cd);
errno = e;
return (size_t) (-1);
iconv_close (cd);
errno = e;
return (size_t) (-1);
@@
-595,7
+596,7
@@
static size_t convert_string (ICONV_CONST char *f, size_t flen,
*tlen = ob - buf;
*tlen = ob - buf;
-
safe
_realloc (&buf, ob - buf + 1);
+
mem
_realloc (&buf, ob - buf + 1);
*t = buf;
iconv_close (cd);
*t = buf;
iconv_close (cd);
@@
-608,25
+609,25
@@
int mutt_convert_nonmime_string (char **ps)
for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
char *u = *ps;
for (c = AssumedCharset; c; c = c1 ? c1 + 1 : 0) {
char *u = *ps;
- char *s;
+ char *s
= NULL
;
char *fromcode;
size_t m, n;
char *fromcode;
size_t m, n;
- size_t ulen =
mutt_str
len (*ps);
+ size_t ulen =
str_
len (*ps);
size_t slen;
if (!u || !*u)
return 0;
c1 = strchr (c, ':');
size_t slen;
if (!u || !*u)
return 0;
c1 = strchr (c, ':');
- n = c1 ? c1 - c :
mutt_str
len (c);
+ n = c1 ? c1 - c :
str_
len (c);
if (!n)
continue;
if (!n)
continue;
- fromcode =
safe
_malloc (n + 1);
+ fromcode =
mem
_malloc (n + 1);
strfcpy (fromcode, c, n + 1);
m = convert_string (u, ulen, fromcode, Charset, &s, &slen);
strfcpy (fromcode, c, n + 1);
m = convert_string (u, ulen, fromcode, Charset, &s, &slen);
-
FREE
(&fromcode);
+
mem_free
(&fromcode);
if (m != (size_t) (-1)) {
if (m != (size_t) (-1)) {
-
FREE
(ps);
+
mem_free
(ps);
*ps = s;
return 0;
}
*ps = s;
return 0;
}