diff options
| author | Elliott Hughes <enh@google.com> | 2019-03-29 13:39:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-29 13:39:41 -0700 |
| commit | d4952191e4a16a7c29e0b2952d71fd86334bf48c (patch) | |
| tree | 818308423a4b5cb604e41b2bba846102949d6e3a /toolbox/upstream-netbsd/usr.bin/grep/file.c | |
| parent | f33436d7208e35f640d058f6cf9a1ca8b71d1849 (diff) | |
| parent | 0b2474d84fba8c038d174ee13022d0234e2d1f1e (diff) | |
Merge "BSD grep: sync with upstream." am: a42823b264 am: 1a420368d8
am: 0b2474d84f
Change-Id: I02cc77ba673fd298623f44164da7b2b0957d9000
Diffstat (limited to 'toolbox/upstream-netbsd/usr.bin/grep/file.c')
| -rw-r--r-- | toolbox/upstream-netbsd/usr.bin/grep/file.c | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/toolbox/upstream-netbsd/usr.bin/grep/file.c b/toolbox/upstream-netbsd/usr.bin/grep/file.c index cf4a0fa4e9..ef057ba153 100644 --- a/toolbox/upstream-netbsd/usr.bin/grep/file.c +++ b/toolbox/upstream-netbsd/usr.bin/grep/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.7 2011/04/18 22:46:48 joerg Exp $ */ +/* $NetBSD: file.c,v 1.10 2018/08/12 09:03:21 christos Exp $ */ /* $FreeBSD: head/usr.bin/grep/file.c 211496 2010-08-19 09:28:59Z des $ */ /* $OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $ */ @@ -35,15 +35,12 @@ #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: file.c,v 1.7 2011/04/18 22:46:48 joerg Exp $"); +__RCSID("$NetBSD: file.c,v 1.10 2018/08/12 09:03:21 christos Exp $"); #include <sys/param.h> #include <sys/types.h> #include <sys/stat.h> -#ifndef __ANDROID__ -#include <bzlib.h> -#endif #include <err.h> #include <errno.h> #include <fcntl.h> @@ -53,17 +50,16 @@ __RCSID("$NetBSD: file.c,v 1.7 2011/04/18 22:46:48 joerg Exp $"); #include <unistd.h> #include <wchar.h> #include <wctype.h> -#ifndef __ANDROID__ -#include <zlib.h> -#endif #include "grep.h" #define MAXBUFSIZ (32 * 1024) #define LNBUFBUMP 80 -#ifndef __ANDROID__ +#ifndef WITHOUT_GZIP static gzFile gzbufdesc; +#endif +#ifndef WITHOUT_BZ2 static BZFILE* bzbufdesc; #endif @@ -77,18 +73,21 @@ static size_t lnbuflen; static inline int grep_refill(struct file *f) { - ssize_t nr; -#ifndef __ANDROID__ + ssize_t nr = -1; int bzerr; -#endif bufpos = buffer; bufrem = 0; -#ifndef __ANDROID__ - if (filebehave == FILE_GZIP) +#ifndef WITHOUT_GZIP + if (filebehave == FILE_GZIP) { nr = gzread(gzbufdesc, buffer, MAXBUFSIZ); - else if (filebehave == FILE_BZIP && bzbufdesc != NULL) { + if (nr == -1) + return -1; + } +#endif +#ifndef WITHOUT_BZ2 + if (filebehave == FILE_BZIP && bzbufdesc != NULL) { nr = BZ2_bzRead(&bzerr, bzbufdesc, buffer, MAXBUFSIZ); switch (bzerr) { case BZ_OK: @@ -114,9 +113,13 @@ grep_refill(struct file *f) /* Make sure we exit with an error */ nr = -1; } - } else + if (nr == -1) + return -1; + } #endif + if (nr == -1) { nr = read(f->fd, buffer, MAXBUFSIZ); + } if (nr < 0) return (-1); @@ -204,11 +207,13 @@ static inline struct file * grep_file_init(struct file *f) { -#ifndef __ANDROID__ +#ifndef WITHOUT_GZIP if (filebehave == FILE_GZIP && (gzbufdesc = gzdopen(f->fd, "r")) == NULL) goto error; +#endif +#ifndef WITHOUT_BZ2 if (filebehave == FILE_BZIP && (bzbufdesc = BZ2_bzdopen(f->fd, "r")) == NULL) goto error; |