===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/names.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/mail/names.c	2018/09/16 02:38:57	1.24
--- src/usr.bin/mail/names.c	2019/06/28 13:35:02	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: names.c,v 1.24 2018/09/16 02:38:57 millert Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: names.c,v 1.25 2019/06/28 13:35:02 deraadt Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
***************
*** 245,251 ****
  			}
  			image = open(tempname, O_RDWR | O_CLOEXEC);
  			(void)rm(tempname);
! 			if (image < 0) {
  				warn("%s", tempname);
  				senderr++;
  				(void)Fclose(fout);
--- 245,251 ----
  			}
  			image = open(tempname, O_RDWR | O_CLOEXEC);
  			(void)rm(tempname);
! 			if (image == -1) {
  				warn("%s", tempname);
  				senderr++;
  				(void)Fclose(fout);
***************
*** 299,305 ****
  				senderr++;
  				goto cant;
  			}
! 			if ((f = dup(image)) < 0) {
  				warn("dup");
  				fin = NULL;
  			} else
--- 299,305 ----
  				senderr++;
  				goto cant;
  			}
! 			if ((f = dup(image)) == -1) {
  				warn("dup");
  				fin = NULL;
  			} else