* 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"
/* Read up to (and including) TERMINATING_STRING from FILE and return it.
* 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;
const int term_length = strlen(terminating_string);
/* grow the line buffer as necessary */
while (idx > linebufsz - 2) {
- linebuf = xrealloc(linebuf, linebufsz += 1000);
+ linebufsz += 200;
+ linebuf = xrealloc(linebuf, linebufsz);
}
linebuf[idx] = ch;
/* 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;
}
-