Date: Wed, 11 Jan 2017 16:09:25 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r311928 - head/usr.bin/tail Message-ID: <201701111609.v0BG9Pce048942@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed Jan 11 16:09:25 2017 New Revision: 311928 URL: https://svnweb.freebsd.org/changeset/base/311928 Log: Fix build of usr.bin/tail with GCC Submitted by: pluknet Reported by: pluknet MFC after: 27 days X-MFC-with: 311895 Sponsored by: Spectra Logic Corp Modified: head/usr.bin/tail/reverse.c Modified: head/usr.bin/tail/reverse.c ============================================================================== --- head/usr.bin/tail/reverse.c Wed Jan 11 11:25:18 2017 (r311927) +++ head/usr.bin/tail/reverse.c Wed Jan 11 16:09:25 2017 (r311928) @@ -170,11 +170,11 @@ r_reg(FILE *fp, const char *fn, enum STY ierr(fn); } -static const size_t bsz = 128 * 1024; +#define BSZ (128 * 1024) typedef struct bfelem { TAILQ_ENTRY(bfelem) entries; size_t len; - char l[bsz]; + char l[BSZ]; } bfelem_t; /* @@ -190,8 +190,8 @@ typedef struct bfelem { static void r_buf(FILE *fp, const char *fn) { - struct bfelem *tl, *temp, *first = NULL; - size_t len, llen; + struct bfelem *tl, *first = NULL; + size_t llen; char *p; off_t enomem = 0; TAILQ_HEAD(bfhead, bfelem) head; @@ -199,6 +199,8 @@ r_buf(FILE *fp, const char *fn) TAILQ_INIT(&head); while (!feof(fp)) { + size_t len; + /* * Allocate a new block and link it into place in a doubly * linked list. If out of memory, toss the LRU block and @@ -216,9 +218,9 @@ r_buf(FILE *fp, const char *fn) /* Fill the block with input data. */ len = 0; - while ((!feof(fp)) && len < bsz) { + while ((!feof(fp)) && len < BSZ) { p = tl->l + len; - len += fread(p, 1, bsz - len, fp); + len += fread(p, 1, BSZ - len, fp); if (ferror(fp)) { ierr(fn); return; @@ -244,6 +246,8 @@ r_buf(FILE *fp, const char *fn) tl = TAILQ_LAST(&head, bfhead); first = TAILQ_FIRST(&head); while (tl != NULL) { + struct bfelem *temp; + for (p = tl->l + tl->len - 1, llen = 0; p >= tl->l; --p, ++llen) { int start = (tl == first && p == tl->l); @@ -251,7 +255,7 @@ r_buf(FILE *fp, const char *fn) if ((*p == '\n') || start) { struct bfelem *tr; - if (start && len) + if (start && llen) WR(p, llen + 1); else if (llen) WR(p + 1, llen);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701111609.v0BG9Pce048942>