===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffreg.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -c -r1.92 -r1.93
*** src/usr.bin/diff/diffreg.c	2019/06/28 05:35:34	1.92
--- src/usr.bin/diff/diffreg.c	2019/06/28 13:35:00	1.93
***************
*** 1,4 ****
! /*	$OpenBSD: diffreg.c,v 1.92 2019/06/28 05:35:34 deraadt Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diffreg.c,v 1.93 2019/06/28 13:35:00 deraadt Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 315,321 ****
  	else {
  		if (!S_ISREG(stb1.st_mode)) {
  			if ((f1 = opentemp(file1)) == NULL ||
! 			    fstat(fileno(f1), &stb1) < 0) {
  				warn("%s", file1);
  				status |= 2;
  				goto closem;
--- 315,321 ----
  	else {
  		if (!S_ISREG(stb1.st_mode)) {
  			if ((f1 = opentemp(file1)) == NULL ||
! 			    fstat(fileno(f1), &stb1) == -1) {
  				warn("%s", file1);
  				status |= 2;
  				goto closem;
***************
*** 336,342 ****
  	else {
  		if (!S_ISREG(stb2.st_mode)) {
  			if ((f2 = opentemp(file2)) == NULL ||
! 			    fstat(fileno(f2), &stb2) < 0) {
  				warn("%s", file2);
  				status |= 2;
  				goto closem;
--- 336,342 ----
  	else {
  		if (!S_ISREG(stb2.st_mode)) {
  			if ((f2 = opentemp(file2)) == NULL ||
! 			    fstat(fileno(f2), &stb2) == -1) {
  				warn("%s", file2);
  				status |= 2;
  				goto closem;
***************
*** 452,458 ****
  
  	if (strcmp(file, "-") == 0)
  		ifd = STDIN_FILENO;
! 	else if ((ifd = open(file, O_RDONLY, 0644)) < 0)
  		return (NULL);
  
  	(void)strlcpy(tempfile, _PATH_TMP "/diff.XXXXXXXX", sizeof(tempfile));
--- 452,458 ----
  
  	if (strcmp(file, "-") == 0)
  		ifd = STDIN_FILENO;
! 	else if ((ifd = open(file, O_RDONLY, 0644)) == -1)
  		return (NULL);
  
  	(void)strlcpy(tempfile, _PATH_TMP "/diff.XXXXXXXX", sizeof(tempfile));
***************
*** 930,936 ****
  	ssize_t nr;
  
  	line = xmalloc(rlen + 1);
! 	if ((nr = pread(fd, line, rlen, off)) < 0)
  		err(2, "preadline");
  	if (nr > 0 && line[nr-1] == '\n')
  		nr--;
--- 930,936 ----
  	ssize_t nr;
  
  	line = xmalloc(rlen + 1);
! 	if ((nr = pread(fd, line, rlen, off)) == -1)
  		err(2, "preadline");
  	if (nr > 0 && line[nr-1] == '\n')
  		nr--;