From 1cc56c818e58c78b66d7fd8fb337bf8860817dcf Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 31 Mar 2015 07:47:53 +0000 Subject: LuaTeX: Fixed a zip_close bug (from Luigi) git-svn-id: svn://tug.org/texlive/trunk@36687 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/ChangeLog | 14 +++++++++----- Build/source/texk/web2c/luatexdir/luazip/src/luazip.c | 16 +++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 7c9c0207524..6db573fe618 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,6 +1,10 @@ +2015-03-31 Peter Breitenlohner + + * luazip/src/luazip.c (zip_close): Sync with the upstream. + 2015-03-19 Luigi Scarso + New library newtokenlib; several bugs fixed. - 2015-01-14 Luigi Scarso @@ -864,12 +868,12 @@ 2010-05-06 Taco Hoekwater - * luatex.c (calledit): use ifdef __MINGW32__ instead of WIN32. + * luatex.c (calledit): use ifdef __MINGW32__ instead of WIN32. * luatex_svnversion.h: updated to reflect the version of 0.60.x branch 2010-04-28 Taco Hoekwater - * tex/maincontrol.w: Fixed the error message for improper + * tex/maincontrol.w: Fixed the error message for improper use of \protected, reported by Heiko Oberdiek . @@ -1193,7 +1197,7 @@ 2009-06-26 Taco Hoekwater - * lua51/lcoco.c, lua51/lcoco.h: disable the coco patch on + * lua51/lcoco.c, lua51/lcoco.h: disable the coco patch on linux+ppc because it crashes the executable. 2009-06-25 Peter Breitenlohner @@ -1231,7 +1235,7 @@ 2009-06-03 Taco Hoekwater * luatexdir/luafontloader/fontforge/fontforge/namelist.c (psaltnames): add - a dimension specifier, for AIX portability. + a dimension specifier, for AIX portability. 2009-06-03 Taco Hoekwater diff --git a/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c b/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c index eb731349f0d..cebd343cece 100644 --- a/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c +++ b/Build/source/texk/web2c/luatexdir/luazip/src/luazip.c @@ -97,15 +97,17 @@ static int zip_open (lua_State *L) { return 1; } + static int zip_close (lua_State *L) { ZZIP_DIR* f = tofile(L, 1); - if (zzip_dir_close(f) == 0) - { - *(ZZIP_DIR**)lua_touserdata(L, 1) = NULL; /* mark file as close */ - lua_pushboolean(L, 1); - } - else - lua_pushboolean(L, 0); + if ( zzip_closedir(f) == 0 ) + { + *(ZZIP_DIR**)lua_touserdata(L, 1) = NULL; /* mark file as close */ + lua_pushboolean(L, 1); + } + else { + lua_pushboolean(L, 0); + } return 1; } -- cgit v1.2.3