nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using 'long' versions of 'fseek'/'ftell' when available

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2011-09-13 18:09:04 -03:00
parent 2275030b86
commit 5ea8f108e1
1 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
liolib.c
View File

@@ -1,10 +1,20 @@
/* /*
** $Id: liolib.c,v 2.102 2011/07/28 18:41:15 roberto Exp roberto $ ** $Id: liolib.c,v 2.103 2011/08/02 18:00:01 roberto Exp roberto $
** Standard I/O (and system) library ** Standard I/O (and system) library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
/*
** POSIX idiosyncrasy!
** This definition must come before the inclusion of 'stdio.h'; it
** should not affect non-POSIX systems
*/
#if !defined(_FILE_OFFSET_BITS)
#define _FILE_OFFSET_BITS 64
#endif
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -21,9 +31,12 @@
/* /*
** lua_popen spawns a new process connected to the current one through ** {======================================================
** the file streams. ** lua_popen spawns a new process connected to the current
** one through the file streams.
** =======================================================
*/ */
#if !defined(lua_popen) /* { */ #if !defined(lua_popen) /* { */
#if defined(LUA_USE_POPEN) /* { */ #if defined(LUA_USE_POPEN) /* { */
@@ -48,6 +61,41 @@
#endif /* } */ #endif /* } */
/* }====================================================== */
/*
** {======================================================
** lua_fseek/lua_ftell: configuration for longer offsets
** =======================================================
*/
#if !defined(lua_fseek) /* { */
#if defined(LUA_USE_POSIX)
#define l_fseek(f,o,w) fseeko(f,o,w)
#define l_ftell(f) ftello(f)
#define l_seeknum off_t
#elif defined(LUA_WIN)
#define l_fseek(f,o,w) _fseeki64(f,o,w)
#define l_ftell(f) _ftelli64(f)
#define l_seeknum __int64
#else
#define l_fseek(f,o,w) fseek(f,o,w)
#define l_ftell(f) ftell(f)
#define l_seeknum long
#endif
#endif /* } */
/* }====================================================== */
#define IO_PREFIX "_IO_" #define IO_PREFIX "_IO_"
#define IO_INPUT (IO_PREFIX "input") #define IO_INPUT (IO_PREFIX "input")
@@ -492,12 +540,15 @@ static int f_seek (lua_State *L) {
static const char *const modenames[] = {"set", "cur", "end", NULL}; static const char *const modenames[] = {"set", "cur", "end", NULL};
FILE *f = tofile(L); FILE *f = tofile(L);
int op = luaL_checkoption(L, 2, "cur", modenames); int op = luaL_checkoption(L, 2, "cur", modenames);
long offset = luaL_optlong(L, 3, 0); lua_Number p3 = luaL_optnumber(L, 3, 0);
op = fseek(f, offset, mode[op]); l_seeknum offset = (l_seeknum)p3;
luaL_argcheck(L, (lua_Number)offset == p3, 3,
"not an integer in proper range");
op = l_fseek(f, offset, mode[op]);
if (op) if (op)
return luaL_fileresult(L, 0, NULL); /* error */ return luaL_fileresult(L, 0, NULL); /* error */
else { else {
lua_pushinteger(L, ftell(f)); lua_pushnumber(L, (lua_Number)l_ftell(f));
return 1; return 1;
} }
} }