openvt,getty,vfork_daemon_rexec,mount: tighten up fd cleanup code

[oweals/busybox.git] / libbb / get_line_from_file.c

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 9035c041286752de1594927a8e488888a5355c5d..2c9608e9edc2f00f2e3c12a1c5d525c7d736a770 100644 (file)
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -2,66 +2,68 @@
 /*
  * 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 "libbb.h"
 
+/* 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 */
 
-
-/* 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. */
-extern char *get_line_from_file(FILE *file)
+char *bb_get_chunk_from_file(FILE * file, int *end)
 {
-       static const int GROWBY = 80; /* how large we will grow strings by */
-
        int ch;
        int idx = 0;
        char *linebuf = NULL;
        int linebufsz = 0;
 
-       while (1) {
-               ch = fgetc(file);
-               if (ch == EOF)
-                       break;
+       while ((ch = getc(file)) != EOF) {
                /* grow the line buffer as necessary */
-               while (idx > linebufsz-2)
-                       linebuf = xrealloc(linebuf, linebufsz += GROWBY);
-               linebuf[idx++] = (char)ch;
-               if ((char)ch == '\n')
+               if (idx >= linebufsz) {
+                       linebuf = xrealloc(linebuf, linebufsz += 80);
+               }
+               linebuf[idx++] = (char) ch;
+               if (!ch || (end && ch == '\n'))
                        break;
        }
+       if (end)
+               *end = idx;
+       if (linebuf) {
+               // 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;
+}
 
-       if (idx == 0)
-               return NULL;
+/* Get line, including trailing \n if any */
+char *xmalloc_fgets(FILE * file)
+{
+       int i;
 
-       linebuf[idx] = 0;
-       return linebuf;
+       return bb_get_chunk_from_file(file, &i);
 }
 
+/* Get line.  Remove trailing \n */
+char *xmalloc_getline(FILE * file)
+{
+       int i;
+       char *c = bb_get_chunk_from_file(file, &i);
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       if (i && c[--i] == '\n')
+               c[i] = '\0';
+
+       return c;
+}