projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo fix in a comment
[gnulib.git]
/
lib
/
getdelim.c
diff --git
a/lib/getdelim.c
b/lib/getdelim.c
index
8498b75
..
35cb2d8
100644
(file)
--- a/
lib/getdelim.c
+++ b/
lib/getdelim.c
@@
-1,5
+1,5
@@
/* getdelim.c --- Implementation of replacement getdelim function.
/* getdelim.c --- Implementation of replacement getdelim function.
- Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005 Free
+ Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005
, 2006, 2007, 2008
Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or
Software Foundation, Inc.
This program is free software; you can redistribute it and/or
@@
-19,22
+19,32
@@
/* Ported from glibc by Simon Josefsson. */
/* Ported from glibc by Simon Josefsson. */
-#i
fdef HAVE_CONFIG_H
-# include <config.h>
-#
endif
+#i
nclude <config.h>
+
+#
include <stdio.h>
+#include <limits.h>
#include <stdlib.h>
#include <errno.h>
#include <stdlib.h>
#include <errno.h>
-#include "getdelim.h"
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
-#if !HAVE_FLOCKFILE
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+# define getc_maybe_unlocked(fp) getc(fp)
+#elif !HAVE_FLOCKFILE || !HAVE_FUNLOCKFILE || !HAVE_DECL_GETC_UNLOCKED
# undef flockfile
# undef flockfile
-# define flockfile(x) ((void) 0)
-#endif
-#if !HAVE_FUNLOCKFILE
# undef funlockfile
# undef funlockfile
+# define flockfile(x) ((void) 0)
# define funlockfile(x) ((void) 0)
# define funlockfile(x) ((void) 0)
+# define getc_maybe_unlocked(fp) getc(fp)
+#else
+# define getc_maybe_unlocked(fp) getc_unlocked(fp)
#endif
/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
#endif
/* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
@@
-46,9
+56,8
@@
ssize_t
getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
{
ssize_t
getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
{
- int result = 0;
- ssize_t cur_len = 0;
- ssize_t len;
+ ssize_t result;
+ size_t cur_len = 0;
if (lineptr == NULL || n == NULL || fp == NULL)
{
if (lineptr == NULL || n == NULL || fp == NULL)
{
@@
-60,36
+69,42
@@
getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
if (*lineptr == NULL || *n == 0)
{
if (*lineptr == NULL || *n == 0)
{
+ char *new_lineptr;
*n = 120;
*n = 120;
-
*lineptr = (char *) malloc (
*n);
- if (
*
lineptr == NULL)
+
new_lineptr = (char *) realloc (*lineptr,
*n);
+ if (
new_
lineptr == NULL)
{
result = -1;
goto unlock_return;
}
{
result = -1;
goto unlock_return;
}
+ *lineptr = new_lineptr;
}
for (;;)
{
}
for (;;)
{
- char *t;
int i;
int i;
- i = getc (fp);
+ i = getc
_maybe_unlocked
(fp);
if (i == EOF)
if (i == EOF)
- {
- result = -1;
- break;
- }
+
{
+
result = -1;
+
break;
+
}
/* Make enough space for len+1 (for final NUL) bytes. */
if (cur_len + 1 >= *n)
{
/* Make enough space for len+1 (for final NUL) bytes. */
if (cur_len + 1 >= *n)
{
- size_t needed = 2 * (cur_len + 1) + 1; /* Be generous. */
+ size_t needed_max =
+ SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
+ size_t needed = 2 * *n + 1; /* Be generous. */
char *new_lineptr;
char *new_lineptr;
- if (needed < cur_len)
+ if (needed_max < needed)
+ needed = needed_max;
+ if (cur_len + 1 >= needed)
{
result = -1;
{
result = -1;
+ errno = EOVERFLOW;
goto unlock_return;
}
goto unlock_return;
}
@@
-114,6
+129,7
@@
getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
result = cur_len ? cur_len : result;
unlock_return:
result = cur_len ? cur_len : result;
unlock_return:
- funlockfile (fp);
+ funlockfile (fp); /* doesn't set errno */
+
return result;
}
return result;
}