projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use a proper "hack" for iconv functions:
[apps/madmutt.git]
/
mbyte.c
diff --git
a/mbyte.c
b/mbyte.c
index
6993422
..
c9f3540
100644
(file)
--- a/
mbyte.c
+++ b/
mbyte.c
@@
-102,14
+102,14
@@
static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd)
ib = buf;
ob = s;
obl = MB_LEN_MAX;
ib = buf;
ob = s;
obl = MB_LEN_MAX;
- r =
iconv
(cd, &ib, &ibl, &ob, &obl);
+ r =
my_iconv
(cd, &ib, &ibl, &ob, &obl);
}
else {
ib = "";
ibl = 1;
ob = buf;
obl = sizeof (buf);
}
else {
ib = "";
ibl = 1;
ob = buf;
obl = sizeof (buf);
- r =
iconv
(cd, &ib, &ibl, &ob, &obl);
+ r =
my_iconv
(cd, &ib, &ibl, &ob, &obl);
}
return ob - s;
}
}
return ob - s;
}
@@
-168,7
+168,7
@@
size_t mbrtowc_iconv (wchar_t * pwc, const char *s, size_t n,
ibl = 1;
for (;;) {
ibl = 1;
for (;;) {
- r =
iconv
(cd, &ib, &ibl, &ob, &obl);
+ r =
my_iconv
(cd, &ib, &ibl, &ob, &obl);
if (ob > bufo && (!k || ib > bufi + k)) {
/* we have a character */
memset (ps, 0, sizeof (*ps));
if (ob > bufo && (!k || ib > bufi + k)) {
/* we have a character */
memset (ps, 0, sizeof (*ps));