X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fget_line_from_file.c;h=b88872d531b6774e775086708d1ddef0d8abfb65;hb=7465dbcf2a4c0a0983d40e5c0f5c057d2ed04125;hp=5af89893403abba70de97563592a01114093927c;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 5af898934..b88872d53 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -2,37 +2,22 @@
 /*
  * Utility routines.
  *
- * Copyright (C) many different people.  If you wrote this, please
- * acknowledge your work.
+ * Copyright (C) 2005, 2006 Rob Landley <rob@landley.net>
+ * Copyright (C) 2004 Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2001 Matt Krai
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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. It returns a malloc'ed char * which must be stored and
- * free'ed  by the caller.  If 'c' is nonzero, the trailing '\n' (if any)
- * is removed.  In event of a read error or EOF, NULL is returned. */
-
-static char *private_get_line_from_file(FILE *file, int c)
+/* 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 *bb_get_chunk_from_file(FILE *file, int *end)
 {
-#define GROWBY (80)		/* how large we will grow strings by */
-
 	int ch;
 	int idx = 0;
 	char *linebuf = NULL;
@@ -40,44 +25,45 @@ static char *private_get_line_from_file(FILE *file, int c)
 
 	while ((ch = getc(file)) != EOF) {
 		/* grow the line buffer as necessary */
-		if (idx > linebufsz-2) {
-			linebuf = xrealloc(linebuf, linebufsz += GROWBY);
+		if (idx >= linebufsz) {
+			linebufsz += 80;
+			linebuf = xrealloc(linebuf, linebufsz);
 		}
-		linebuf[idx++] = (char)ch;
-		if (ch == '\n' || ch == '\0') {
-			if (c) {
-				--idx;
-			}
+		linebuf[idx++] = (char) ch;
+		if (!ch || (end && ch == '\n'))
 			break;
-		}
 	}
-
+	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;
 }
 
-extern char *bb_get_line_from_file(FILE *file)
+/* Get line, including trailing \n if any */
+char *xmalloc_fgets(FILE *file)
 {
-	return private_get_line_from_file(file, 0);
+	int i;
+
+	return bb_get_chunk_from_file(file, &i);
 }
 
-extern char *bb_get_chomped_line_from_file(FILE *file)
+/* Get line.  Remove trailing \n */
+char *xmalloc_fgetline(FILE *file)
 {
-	return private_get_line_from_file(file, 1);
-}
+	int i;
+	char *c = bb_get_chunk_from_file(file, &i);
 
+	if (i && c[--i] == '\n')
+		c[i] = '\0';
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+	return c;
+}