Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/fgets_str.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/fgets_str.c (modified) (4 diffs)

branches/2.2.5/mindi-busybox/libbb/fgets_str.c

@@ -6 +6 @@
  * If you wrote this, please acknowledge your work.
  *
- * 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 <string.h>
 
 #include "libbb.h"
@@ -31 +14 @@
  * Return NULL on EOF.  */
 
-char *fgets_str(FILE *file, const char *terminating_string)
+char *xmalloc_fgets_str(FILE *file, const char *terminating_string)
 {
     char *linebuf = NULL;
@@ -49 +32 @@
         /* grow the line buffer as necessary */
         while (idx > linebufsz - 2) {
-            linebuf = xrealloc(linebuf, linebufsz += 1000);
+            linebufsz += 200;
+            linebuf = xrealloc(linebuf, linebufsz);
         }
 
@@ -57 +41 @@
         /* Check for terminating string */
         end_string_offset = idx - term_length;
-        if ((end_string_offset > 0) && (memcmp(&linebuf[end_string_offset], terminating_string, term_length) == 0)) {
+        if (end_string_offset > 0
+         && memcmp(&linebuf[end_string_offset], terminating_string, term_length) == 0
+        ) {
             idx -= term_length;
             break;
         }
     }
+    linebuf = xrealloc(linebuf, idx + 1);
     linebuf[idx] = '\0';
-    return(linebuf);
+    return linebuf;
 }
-