Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/fgets_str.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/fgets_str.c (modified) (3 diffs)

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

@@ -6 +6 @@
  * If you wrote this, please acknowledge your work.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
-/* Read up to (and including) TERMINATING_STRING from FILE and return it.
- * Return NULL on EOF.  */
-
-char *xmalloc_fgets_str(FILE *file, const char *terminating_string)
+static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, int chop_off, size_t *maxsz_p)
 {
     char *linebuf = NULL;
@@ -22 +19 @@
     int idx = 0;
     int ch;
+    size_t maxsz = *maxsz_p;
 
     while (1) {
         ch = fgetc(file);
         if (ch == EOF) {
-            free(linebuf);
-            return NULL;
+            if (idx == 0)
+                return linebuf; /* NULL */
+            break;
         }
 
-        /* grow the line buffer as necessary */
-        while (idx > linebufsz - 2) {
+        if (idx >= linebufsz) {
             linebufsz += 200;
             linebuf = xrealloc(linebuf, linebufsz);
+            if (idx >= maxsz) {
+                linebuf[idx] = ch;
+                idx++;
+                break;
+            }
         }
 
@@ -41 +44 @@
         /* Check for terminating string */
         end_string_offset = idx - term_length;
-        if (end_string_offset > 0
+        if (end_string_offset >= 0
          && memcmp(&linebuf[end_string_offset], terminating_string, term_length) == 0
         ) {
-            idx -= term_length;
+            if (chop_off)
+                idx -= term_length;
             break;
         }
     }
+    /* Grow/shrink *first*, then store NUL */
     linebuf = xrealloc(linebuf, idx + 1);
     linebuf[idx] = '\0';
+    *maxsz_p = idx;
     return linebuf;
 }
+
+/* Read up to TERMINATING_STRING from FILE and return it,
+ * including terminating string.
+ * Non-terminated string can be returned if EOF is reached.
+ * Return NULL if EOF is reached immediately.  */
+char* FAST_FUNC xmalloc_fgets_str(FILE *file, const char *terminating_string)
+{
+    size_t maxsz = INT_MAX - 4095;
+    return xmalloc_fgets_internal(file, terminating_string, 0, &maxsz);
+}
+
+char* FAST_FUNC xmalloc_fgets_str_len(FILE *file, const char *terminating_string, size_t *maxsz_p)
+{
+    size_t maxsz;
+
+    if (!maxsz_p) {
+        maxsz = INT_MAX - 4095;
+        maxsz_p = &maxsz;
+    }
+    return xmalloc_fgets_internal(file, terminating_string, 0, maxsz_p);
+}
+
+char* FAST_FUNC xmalloc_fgetline_str(FILE *file, const char *terminating_string)
+{
+    size_t maxsz = INT_MAX - 4095;
+    return xmalloc_fgets_internal(file, terminating_string, 1, &maxsz);
+}