fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

An additional size_t-fix in tail(1)

Browse Source
This commit is contained in:
FRIGN 2015-02-09 15:47:08 +01:00
parent 78f33ff069
commit ff7093f7b3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tail.c
View File

@ -15,9 +15,8 @@ static void
dropinit(FILE *fp, const char *str, size_t n) dropinit(FILE *fp, const char *str, size_t n)
{ {
char *buf = NULL; char *buf = NULL;
size_t size = 0; size_t size = 0, i = 0;
ssize_t len; ssize_t len;
unsigned long i = 0;
while (i < n && (len = getline(&buf, &size, fp)) != -1) while (i < n && (len = getline(&buf, &size, fp)) != -1)
if (len > 0 && buf[len - 1] == '\n') if (len > 0 && buf[len - 1] == '\n')
@ -30,14 +29,13 @@ static void
taketail(FILE *fp, const char *str, size_t n) taketail(FILE *fp, const char *str, size_t n)
{ {
char **ring = NULL; char **ring = NULL;
long i, j; size_t i, j, *size = NULL;
size_t *size = NULL;
ring = ecalloc(n, sizeof *ring); ring = ecalloc(n, sizeof *ring);
size = ecalloc(n, sizeof *size); size = ecalloc(n, sizeof *size);
for (i = j = 0; getline(&ring[i], &size[i], fp) != -1; i = j = (i + 1) % n) for (i = j = 0; getline(&ring[i], &size[i], fp) != -1; )
; i = j = (i + 1) % n;
if (ferror(fp)) if (ferror(fp))
eprintf("%s: read error:", str); eprintf("%s: read error:", str);