lua

commit 234fb7f695f9e98fea40cc58b3cd2468e1ee0562
parent c077d4746503b929ac4113c7875175c54eb5796a
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date:   Fri,  2 Jan 2015 10:50:03 -0200

clearer(?) code (also avoids a warning about 'c' being used
without initialization)

Diffstat:
M
liolib.c
 | 
8
+++-----

1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/liolib.c b/liolib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: liolib.c,v 2.140 2014/11/02 19:33:33 roberto Exp roberto $
+** $Id: liolib.c,v 2.141 2014/11/21 12:17:33 roberto Exp roberto $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
@@ -464,9 +464,9 @@ static int test_eof (lua_State *L, FILE *f) {
 
 static int read_line (lua_State *L, FILE *f, int chop) {
   luaL_Buffer b;
-  int c;
+  int c = '\0';
   luaL_buffinit(L, &b);
-  for (;;) {
+  while (c != EOF && c != '\n') {  /* repeat until end of line */
     char *buff = luaL_prepbuffer(&b);  /* pre-allocate buffer */
     int i = 0;
     l_lockfile(f);  /* no memory errors can happen inside the lock */
@@ -474,8 +474,6 @@ static int read_line (lua_State *L, FILE *f, int chop) {
       buff[i++] = c;
     l_unlockfile(f);
     luaL_addsize(&b, i);
-    if (i < LUAL_BUFFERSIZE)
-      break;
   }
   if (!chop && c == '\n')  /* want a newline and have one? */
     luaL_addchar(&b, c);  /* add ending newline to result */