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

'read_all' does not need to grow buffer, as 'luaL_prepbuffsize'

Browse Source 
already does that
This commit is contained in:
Roberto Ierusalimschy
2014-02-21 11:39:50 -03:00
parent c86b9da022
commit 5715de344f
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
liolib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: liolib.c,v 2.114 2013/06/07 19:01:35 roberto Exp roberto $ ** $Id: liolib.c,v 2.115 2014/01/27 13:28:45 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
*/ */
@@ -403,20 +403,15 @@ static int read_line (lua_State *L, FILE *f, int chop) {
} }
#define MAX_SIZE_T (~(size_t)0)
static void read_all (lua_State *L, FILE *f) { static void read_all (lua_State *L, FILE *f) {
size_t rlen = LUAL_BUFFERSIZE; /* how much to read in each cycle */ size_t nr;
luaL_Buffer b; luaL_Buffer b;
luaL_buffinit(L, &b); luaL_buffinit(L, &b);
for (;;) { do { /* read file in chunks of LUAL_BUFFERSIZE bytes */
char *p = luaL_prepbuffsize(&b, rlen); char *p = luaL_prepbuffsize(&b, LUAL_BUFFERSIZE);
size_t nr = fread(p, sizeof(char), rlen, f); nr = fread(p, sizeof(char), LUAL_BUFFERSIZE, f);
luaL_addsize(&b, nr); luaL_addsize(&b, nr);
if (nr < rlen) break; /* eof? */ } while (nr == LUAL_BUFFERSIZE);
else if (rlen <= (MAX_SIZE_T / 4)) /* avoid buffers too large */
rlen *= 2; /* double buffer size at each iteration */
}
luaL_pushresult(&b); /* close buffer */ luaL_pushresult(&b); /* close buffer */
} }