summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-12-09 22:08:19 +0000
committerJim Meyering <jim@meyering.net>2001-12-09 22:08:19 +0000
commit923091ff96b7d35f1517ed6ee6900d4971d5623e (patch)
tree987e7f793b7250b39e7121d652ab5b7eef24d789 /lib
parent26061de96f0443974c5f554a2bfe67442065b5f3 (diff)
downloadcoreutils-923091ff96b7d35f1517ed6ee6900d4971d5623e.tar.xz
Don't include assert.h.
(getstr): Remove warning-evoking assertions. Return -1 if offset parameter is out of bounds. Change the type of a local from int to size_t.
Diffstat (limited to 'lib')
-rw-r--r--lib/getstr.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/getstr.c b/lib/getstr.c
index 98c4ac865..6e748a48a 100644
--- a/lib/getstr.c
+++ b/lib/getstr.c
@@ -25,8 +25,6 @@
#include <stdio.h>
#include <sys/types.h>
-#include <assert.h>
-
#if STDC_HEADERS
# include <stdlib.h>
#else
@@ -49,7 +47,7 @@ int
getstr (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
size_t offset)
{
- int nchars_avail; /* Allocated but unused chars in *LINEPTR. */
+ size_t nchars_avail; /* Allocated but unused chars in *LINEPTR. */
char *read_pos; /* Where we're reading into *LINEPTR. */
int ret;
@@ -64,6 +62,9 @@ getstr (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
return -1;
}
+ if (*n < offset)
+ return -1;
+
nchars_avail = *n - offset;
read_pos = *lineptr + offset;
@@ -75,7 +76,6 @@ getstr (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
always (unless we get an error while reading the first char)
NUL-terminate the line buffer. */
- assert(*n - nchars_avail == read_pos - *lineptr);
if (nchars_avail < 2)
{
if (*n > MIN_CHUNK)
@@ -88,7 +88,6 @@ getstr (char **lineptr, size_t *n, FILE *stream, int delim1, int delim2,
if (!*lineptr)
return -1;
read_pos = *n - nchars_avail + *lineptr;
- assert(*n - nchars_avail == read_pos - *lineptr);
}
if (c == EOF || ferror (stream))