dany/lua-iconv
1
0
Fork 0
mirror of https://github.com/lunarmodules/lua-iconv.git synced 2025-06-23 04:34:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: file:///var/svn/lua-iconv/trunk@11 9538949d-8f27-0410-946f-ce01ef448559
This commit is contained in:
Alexandre Erwin Ittner 2005-07-06 03:17:28 +00:00
parent 0be1828c41
commit 2155d1b315
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
luaiconv.c
View File

@ -99,12 +99,12 @@ static int Liconv(lua_State *L)
char *inbuf = (char*) getstring(L, 2); char *inbuf = (char*) getstring(L, 2);
char *outbuf; char *outbuf;
char *outbufs; char *outbufs;
size_t bsize = 4 * ibleft; /* Try to avoid concatenations on stack */ size_t obsize = ibleft; /* Try to avoid concatenations on stack */
size_t obleft = bsize; size_t obleft = obsize;
size_t ret = -1; size_t ret = -1;
int hasone = 0; int hasone = 0;
outbuf = (char*) malloc(bsize * sizeof(char)); outbuf = (char*) malloc(obsize * sizeof(char));
if(outbuf == NULL) if(outbuf == NULL)
{ {
lua_pushstring(L, ""); lua_pushstring(L, "");
@ -118,40 +118,29 @@ static int Liconv(lua_State *L)
ret = iconv(cd, &inbuf, &ibleft, &outbuf, &obleft); ret = iconv(cd, &inbuf, &ibleft, &outbuf, &obleft);
if(ret == (size_t)(-1)) if(ret == (size_t)(-1))
{ {
if(errno == EILSEQ) lua_pushlstring(L, outbufs, obsize - obleft);
{
lua_pushlstring(L, outbufs, bsize-obleft);
if(hasone == 1) if(hasone == 1)
lua_concat(L, 2); lua_concat(L, 2);
hasone = 1; hasone = 1;
if(errno == EILSEQ)
{
lua_pushnumber(L, ERROR_INVALID); lua_pushnumber(L, ERROR_INVALID);
free(outbufs); free(outbufs);
return 2; /* Invalid character sequence */ return 2; /* Invalid character sequence */
} }
else if(errno == EINVAL) else if(errno == EINVAL)
{ {
lua_pushlstring(L, outbufs, bsize-obleft);
if(hasone == 1)
lua_concat(L, 2);
hasone = 1;
lua_pushnumber(L, ERROR_INCOMPLETE); lua_pushnumber(L, ERROR_INCOMPLETE);
free(outbufs); free(outbufs);
return 2; /* Incomplete character sequence */ return 2; /* Incomplete character sequence */
} }
else if(errno == E2BIG) else if(errno == E2BIG)
{ {
lua_pushlstring(L, outbufs, bsize-obleft); obleft = obsize;
if(hasone == 1) outbuf = outbufs;
lua_concat(L, 2);
hasone = 1;
obleft = bsize;
} }
else else
{ {
lua_pushlstring(L, outbufs, bsize-obleft);
if(hasone == 1)
lua_concat(L, 2);
hasone = 1;
lua_pushnumber(L, ERROR_UNKNOWN); lua_pushnumber(L, ERROR_UNKNOWN);
free(outbufs); free(outbufs);
return 2; /* Unknown error */ return 2; /* Unknown error */
@ -160,7 +149,7 @@ static int Liconv(lua_State *L)
} }
while(ret != (size_t) 0); while(ret != (size_t) 0);
lua_pushlstring(L, outbufs, bsize-obleft); lua_pushlstring(L, outbufs, obsize - obleft);
if(hasone == 1) if(hasone == 1)
lua_concat(L, 2); lua_concat(L, 2);
free(outbufs); free(outbufs);

4
test_iconv.lua
View File

@ -7,8 +7,8 @@ cd = iconv.new("utf-8", "iso-8859-1")
assert(cd, "Invalid conversion") assert(cd, "Invalid conversion")
ret, err = cd:iconv("Isso é um teste com acentuação") --ret, err = cd:iconv("Isso é um teste com acentuação")
-- ret, err = cd:iconv("çãÃÉÍÓÚÇÑÿ ") ret, err = cd:iconv("çãÃÉÍÓÚÇÑÿa")
if err == iconv.ERROR_INCOMPLETE then if err == iconv.ERROR_INCOMPLETE then
print("Error: Incomplete input.") print("Error: Incomplete input.")