X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fget_line_from_file.c;h=2c9608e9edc2f00f2e3c12a1c5d525c7d736a770;hb=9af7c9d6b62ceb07a9ba24cee0cf4a08c689235e;hp=44cf448691a37c05b0b238af59bc4a441d41b13b;hpb=dfba741457cc81eb2ed3a9d4c074fbad74aa3249;p=oweals%2Fbusybox.git

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 44cf44869..2c9608e9e 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -9,16 +9,15 @@
  * 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
- * and of line.  If end isn't null, length of the chunk read is stored in it. */
+/* 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
+ * 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.
+ * Return NULL if EOF/error */
 
-char *bb_get_chunk_from_file(FILE *file, int *end)
+char *bb_get_chunk_from_file(FILE * file, int *end)
 {
 	int ch;
 	int idx = 0;
@@ -27,36 +26,44 @@ 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) {
+		if (idx >= linebufsz) {
 			linebuf = xrealloc(linebuf, linebufsz += 80);
 		}
-		linebuf[idx++] = (char)ch;
-		if (!ch || (end && ch == '\n')) break;
+		linebuf[idx++] = (char) ch;
+		if (!ch || (end && ch == '\n'))
+			break;
 	}
-	if (end) *end = idx;
+	if (end)
+		*end = idx;
 	if (linebuf) {
-		if (ferror(file)) {
-			free(linebuf);
-			return NULL;
-		}
-		linebuf[idx] = 0;
+		// 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';
 	}
 	return linebuf;
 }
 
-/* Get line, including trailing /n if any */
-char *bb_get_line_from_file(FILE *file)
+/* Get line, including trailing \n if any */
+char *xmalloc_fgets(FILE * file)
 {
 	int i;
+
 	return bb_get_chunk_from_file(file, &i);
 }
 
-/* Get line.  Remove trailing /n */
-char *bb_get_chomped_line_from_file(FILE *file)
+/* Get line.  Remove trailing \n */
+char *xmalloc_getline(FILE * file)
 {
 	int i;
-	char *c=bb_get_chunk_from_file(file, &i);
-	if(i) c[--i]=0;
-	
+	char *c = bb_get_chunk_from_file(file, &i);
+
+	if (i && c[--i] == '\n')
+		c[i] = '\0';
+
 	return c;
 }