X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=libbb%2Fget_line_from_file.c;h=66ea5a1a5d99d5bde517090d9cc838bdee82869f;hb=defc1ea34074e7882724c460260d307cdf981a70;hp=722a904b52cd06595808e533960b9c3e2ad5fc54;hpb=372686bde7b4c0abaf01123d8dda1dc6ab9a92e2;p=oweals%2Fbusybox.git

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 722a904b5..66ea5a1a5 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -9,16 +9,14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "libbb.h"
 
-/* get_line_from_file() - This function reads an entire line from a text file,
- * up to a newline or NUL byte.  It returns a malloc'ed char * which must be
- * stored and free'ed  by the caller.  If end is null '\n' isn't considered
- * end of line.  If end isn't null, length of the chunk read is stored in it. */
-
-char *bb_get_chunk_from_file(FILE * file, int *end)
+/* This function reads an entire line from a text file, up to a newline
+ * or NUL byte, inclusive.  It returns a malloc'ed char * which
+ * must be free'ed by the caller.  If end is NULL '\n' isn't considered
+ * end of line.  If end isn't NULL, length of the chunk read is stored in it.
+ * Return NULL if EOF/error */
+char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
 {
 	int ch;
 	int idx = 0;
@@ -27,8 +25,9 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
 
 	while ((ch = getc(file)) != EOF) {
 		/* grow the line buffer as necessary */
-		if (idx > linebufsz - 2) {
-			linebuf = xrealloc(linebuf, linebufsz += 80);
+		if (idx >= linebufsz) {
+			linebufsz += 80;
+			linebuf = xrealloc(linebuf, linebufsz);
 		}
 		linebuf[idx++] = (char) ch;
 		if (!ch || (end && ch == '\n'))
@@ -37,18 +36,20 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
 	if (end)
 		*end = idx;
 	if (linebuf) {
-		if (ferror(file)) {
-			free(linebuf);
-			return NULL;
-		}
+		// huh, does fgets discard prior data on error like this?
+		// I don't think so....
+		//if (ferror(file)) {
+		//	free(linebuf);
+		//	return NULL;
+		//}
 		linebuf = xrealloc(linebuf, idx+1);
-		linebuf[idx] = 0;
+		linebuf[idx] = '\0';
 	}
 	return linebuf;
 }
 
 /* Get line, including trailing \n if any */
-char *bb_get_line_from_file(FILE * file)
+char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
 	int i;
 
@@ -56,13 +57,13 @@ char *bb_get_line_from_file(FILE * file)
 }
 
 /* Get line.  Remove trailing \n */
-char *bb_get_chomped_line_from_file(FILE * file)
+char* FAST_FUNC xmalloc_fgetline(FILE *file)
 {
 	int i;
 	char *c = bb_get_chunk_from_file(file, &i);
 
 	if (i && c[--i] == '\n')
-		c[i] = 0;
+		c[i] = '\0';
 
 	return c;
 }