vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dan sinclair's fix. 

SVN revision: 8986
This commit is contained in:
Carsten Haitzler 2004-02-16 02:48:13 +00:00
parent f2739b6881
commit 2ca079e07e
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/ecore/Makefile.am
View File

@ -30,8 +30,8 @@ dist-hook:
bin_SCRIPTS = ecore-config bin_SCRIPTS = ecore-config
EXTRA_DIST = README AUTHORS COPYING ecore.m4 ecore.spec ecore.c.in gendoc Doxyfile ecore_docs.tar.gz \ EXTRA_DIST = README AUTHORS COPYING ecore.m4 ecore.spec ecore.c.in gendoc \
make_cross_compile_arm.sh conf-e-x11.sh Doxyfile ecore_docs.tar.gz make_cross_compile_arm.sh
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = ecore.m4 m4data_DATA = ecore.m4

3
legacy/ecore/gendoc
View File

@ -9,4 +9,7 @@ done
rm -rf ./doc/html ./doc/latex ./doc/man rm -rf ./doc/html ./doc/latex ./doc/man
doxygen doxygen
cp doc/img/*.png doc/html/ cp doc/img/*.png doc/html/
rm -f ecore_docs.tar ecore_docs.tar.gz
tar -cvf ecore_docs.tar doc/html doc/man doc/latex
gzip -9 ecore_docs.tar
exit 0 exit 0

14
legacy/ecore/src/lib/ecore_txt/ecore_txt.c
View File

@ -30,7 +30,7 @@ ecore_txt_convert(char *enc_from, char *enc_to, char *text)
for (;;) for (;;)
{ {
size_t count; size_t count;
tob = outb; tob = outb;
count = iconv(ic, &inp, &inb, &outp, &outb); count = iconv(ic, &inp, &inb, &outp, &outb);
outlen += tob - outb; outlen += tob - outb;
@ -42,6 +42,18 @@ ecore_txt_convert(char *enc_from, char *enc_to, char *text)
outalloc += 64; outalloc += 64;
outb += 64; outb += 64;
} }
else if (errno == EILSEQ)
{
if (new_txt) free(new_txt);
new_txt = NULL;
break;
}
else if (errno == EINVAL)
{
if (new_txt) free(new_txt);
new_txt = NULL;
break;
}
} }
if (inb == 0) if (inb == 0)
{ {