===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/quit.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/mail/quit.c	2015/11/11 01:12:10	1.22
--- src/usr.bin/mail/quit.c	2016/07/19 06:43:27	1.23
***************
*** 1,4 ****
! /*	$OpenBSD: quit.c,v 1.22 2015/11/11 01:12:10 deraadt Exp $	*/
  /*	$NetBSD: quit.c,v 1.6 1996/12/28 07:11:07 tls Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: quit.c,v 1.23 2016/07/19 06:43:27 deraadt Exp $	*/
  /*	$NetBSD: quit.c,v 1.6 1996/12/28 07:11:07 tls Exp $	*/
  
  /*
***************
*** 188,193 ****
--- 188,195 ----
  	mbox = expand("&");
  	mcount = c;
  	if (value("append") == NULL) {
+ 		int fdx;
+ 
  		(void)snprintf(tempname, sizeof(tempname),
  		    "%s/mail.RmXXXXXXXXXX", tmpdir);
  		if ((fd = mkstemp(tempname)) == -1 ||
***************
*** 220,226 ****
  			return(-1);
  		}
  		(void)Fclose(obuf);
! 		(void)close(open(mbox, O_CREAT | O_TRUNC | O_WRONLY, 0600));
  		if ((obuf = Fopen(mbox, "r+")) == NULL) {
  			warn("%s", mbox);
  			(void)Fclose(ibuf);
--- 222,229 ----
  			return(-1);
  		}
  		(void)Fclose(obuf);
! 		if ((fdx = open(mbox, O_CREAT | O_TRUNC | O_WRONLY, 0600)) != -1)
! 			close(fdx);
  		if ((obuf = Fopen(mbox, "r+")) == NULL) {
  			warn("%s", mbox);
  			(void)Fclose(ibuf);