===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/read.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -c -r1.163 -r1.164
*** src/usr.bin/mandoc/read.c	2017/07/08 17:52:42	1.163
--- src/usr.bin/mandoc/read.c	2017/07/20 14:36:32	1.164
***************
*** 1,4 ****
! /*	$OpenBSD: read.c,v 1.163 2017/07/08 17:52:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: read.c,v 1.164 2017/07/20 14:36:32 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 22,28 ****
  
  #include <assert.h>
  #include <ctype.h>
- #include <err.h>
  #include <errno.h>
  #include <fcntl.h>
  #include <stdarg.h>
--- 22,27 ----
***************
*** 556,563 ****
  	size_t		 off;
  	ssize_t		 ssz;
  
! 	if (fstat(fd, &st) == -1)
! 		err((int)MANDOCLEVEL_SYSERR, "%s", file);
  
  	/*
  	 * If we're a regular file, try just reading in the whole entry
--- 555,565 ----
  	size_t		 off;
  	ssize_t		 ssz;
  
! 	if (fstat(fd, &st) == -1) {
! 		mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
! 		    "fstat: %s", strerror(errno));
! 		return 0;
! 	}
  
  	/*
  	 * If we're a regular file, try just reading in the whole entry
***************
*** 579,586 ****
  	}
  
  	if (curp->gzip) {
! 		if ((gz = gzdopen(fd, "rb")) == NULL)
! 			err((int)MANDOCLEVEL_SYSERR, "%s", file);
  	} else
  		gz = NULL;
  
--- 581,591 ----
  	}
  
  	if (curp->gzip) {
! 		if ((gz = gzdopen(fd, "rb")) == NULL) {
! 			mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
! 			    "gzdopen: %s", strerror(errno));
! 			return 0;
! 		}
  	} else
  		gz = NULL;
  
***************
*** 609,616 ****
  			fb->sz = off;
  			return 1;
  		}
! 		if (ssz == -1)
! 			err((int)MANDOCLEVEL_SYSERR, "%s", file);
  		off += (size_t)ssz;
  	}
  
--- 614,624 ----
  			fb->sz = off;
  			return 1;
  		}
! 		if (ssz == -1) {
! 			mandoc_vmsg(MANDOCERR_FILE, curp, 0, 0,
! 			    "read: %s", strerror(errno));
! 			break;
! 		}
  		off += (size_t)ssz;
  	}