===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/quit.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -c -r1.12 -r1.12.2.1
*** src/usr.bin/mail/quit.c	2000/04/26 15:47:31	1.12
--- src/usr.bin/mail/quit.c	2000/10/06 21:16:15	1.12.2.1
***************
*** 1,4 ****
! /*	$OpenBSD: quit.c,v 1.12 2000/04/26 15:47:31 millert Exp $	*/
  /*	$NetBSD: quit.c,v 1.6 1996/12/28 07:11:07 tls Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: quit.c,v 1.12.2.1 2000/10/06 21:16:15 jason Exp $	*/
  /*	$NetBSD: quit.c,v 1.6 1996/12/28 07:11:07 tls Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)quit.c	8.2 (Berkeley) 4/28/95";
  #else
! static char rcsid[] = "$OpenBSD: quit.c,v 1.12 2000/04/26 15:47:31 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)quit.c	8.2 (Berkeley) 4/28/95";
  #else
! static char rcsid[] = "$OpenBSD: quit.c,v 1.12.2.1 2000/10/06 21:16:15 jason Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 221,233 ****
  		    "%s/mail.RmXXXXXXXXXX", tmpdir);
  		if ((fd = mkstemp(tempname)) == -1 ||
  		    (obuf = Fdopen(fd, "w")) == NULL) {
! 			warn(tempname);
  			(void)Fclose(fbuf);
  			spool_unlock();
  			return;
  		}
  		if ((ibuf = Fopen(tempname, "r")) == NULL) {
! 			warn(tempname);
  			(void)rm(tempname);
  			(void)Fclose(obuf);
  			(void)Fclose(fbuf);
--- 221,233 ----
  		    "%s/mail.RmXXXXXXXXXX", tmpdir);
  		if ((fd = mkstemp(tempname)) == -1 ||
  		    (obuf = Fdopen(fd, "w")) == NULL) {
! 			warn("%s", tempname);
  			(void)Fclose(fbuf);
  			spool_unlock();
  			return;
  		}
  		if ((ibuf = Fopen(tempname, "r")) == NULL) {
! 			warn("%s", tempname);
  			(void)rm(tempname);
  			(void)Fclose(obuf);
  			(void)Fclose(fbuf);
***************
*** 241,247 ****
  			(void)Fclose(abuf);
  		}
  		if (ferror(obuf)) {
! 			warn(tempname);
  			(void)Fclose(ibuf);
  			(void)Fclose(obuf);
  			(void)Fclose(fbuf);
--- 241,247 ----
  			(void)Fclose(abuf);
  		}
  		if (ferror(obuf)) {
! 			warn("%s", tempname);
  			(void)Fclose(ibuf);
  			(void)Fclose(obuf);
  			(void)Fclose(fbuf);
***************
*** 251,257 ****
  		(void)Fclose(obuf);
  		(void)close(creat(mbox, 0600));
  		if ((obuf = Fopen(mbox, "r+")) == NULL) {
! 			warn(mbox);
  			(void)Fclose(ibuf);
  			(void)Fclose(fbuf);
  			spool_unlock();
--- 251,257 ----
  		(void)Fclose(obuf);
  		(void)close(creat(mbox, 0600));
  		if ((obuf = Fopen(mbox, "r+")) == NULL) {
! 			warn("%s", mbox);
  			(void)Fclose(ibuf);
  			(void)Fclose(fbuf);
  			spool_unlock();
***************
*** 260,266 ****
  	}
  	else {
  		if ((obuf = Fopen(mbox, "a")) == NULL) {
! 			warn(mbox);
  			(void)Fclose(fbuf);
  			spool_unlock();
  			return;
--- 260,266 ----
  	}
  	else {
  		if ((obuf = Fopen(mbox, "a")) == NULL) {
! 			warn("%s", mbox);
  			(void)Fclose(fbuf);
  			spool_unlock();
  			return;
***************
*** 270,276 ****
  	for (mp = &message[0]; mp < &message[msgCount]; mp++)
  		if (mp->m_flag & MBOX)
  			if (sendmessage(mp, obuf, saveignore, NULL) < 0) {
! 				warn(mbox);
  				(void)Fclose(ibuf);
  				(void)Fclose(obuf);
  				(void)Fclose(fbuf);
--- 270,276 ----
  	for (mp = &message[0]; mp < &message[msgCount]; mp++)
  		if (mp->m_flag & MBOX)
  			if (sendmessage(mp, obuf, saveignore, NULL) < 0) {
! 				warn("%s", mbox);
  				(void)Fclose(ibuf);
  				(void)Fclose(obuf);
  				(void)Fclose(fbuf);
***************
*** 298,304 ****
  	}
  	trunc(obuf);
  	if (ferror(obuf)) {
! 		warn(mbox);
  		(void)Fclose(obuf);
  		(void)Fclose(fbuf);
  		spool_unlock();
--- 298,304 ----
  	}
  	trunc(obuf);
  	if (ferror(obuf)) {
! 		warn("%s", mbox);
  		(void)Fclose(obuf);
  		(void)Fclose(fbuf);
  		spool_unlock();
***************
*** 371,377 ****
  
  	p = 0;
  	if ((obuf = Fopen(mailname, "r+")) == NULL) {
! 		warn(mailname);
  		return(-1);
  	}
  #ifndef APPEND
--- 371,377 ----
  
  	p = 0;
  	if ((obuf = Fopen(mailname, "r+")) == NULL) {
! 		warn("%s", mailname);
  		return(-1);
  	}
  #ifndef APPEND
***************
*** 383,389 ****
  		if ((mp->m_flag&MPRESERVE)||(mp->m_flag&MTOUCH)==0) {
  			p++;
  			if (sendmessage(mp, obuf, NULL, NULL) < 0) {
! 				warn(mailname);
  				(void)Fclose(obuf);
  				return(-1);
  			}
--- 383,389 ----
  		if ((mp->m_flag&MPRESERVE)||(mp->m_flag&MTOUCH)==0) {
  			p++;
  			if (sendmessage(mp, obuf, NULL, NULL) < 0) {
! 				warn("%s", mailname);
  				(void)Fclose(obuf);
  				return(-1);
  			}
***************
*** 396,402 ****
  	fflush(obuf);
  	trunc(obuf);
  	if (ferror(obuf)) {
! 		warn(mailname);
  		(void)Fclose(obuf);
  		return(-1);
  	}
--- 396,402 ----
  	fflush(obuf);
  	trunc(obuf);
  	if (ferror(obuf)) {
! 		warn("%s", mailname);
  		(void)Fclose(obuf);
  		return(-1);
  	}
***************
*** 457,468 ****
  		    tmpdir);
  		if ((fd = mkstemp(tempname)) == -1 ||
  		    (obuf = Fdopen(fd, "w")) == NULL) {
! 			warn(tempname);
  			relsesigs();
  			reset(0);
  		}
  		if ((ibuf = Fopen(mailname, "r")) == NULL) {
! 			warn(mailname);
  			(void)Fclose(obuf);
  			(void)rm(tempname);
  			relsesigs();
--- 457,468 ----
  		    tmpdir);
  		if ((fd = mkstemp(tempname)) == -1 ||
  		    (obuf = Fdopen(fd, "w")) == NULL) {
! 			warn("%s", tempname);
  			relsesigs();
  			reset(0);
  		}
  		if ((ibuf = Fopen(mailname, "r")) == NULL) {
! 			warn("%s", mailname);
  			(void)Fclose(obuf);
  			(void)rm(tempname);
  			relsesigs();
***************
*** 474,480 ****
  		(void)Fclose(ibuf);
  		(void)Fclose(obuf);
  		if ((ibuf = Fopen(tempname, "r")) == NULL) {
! 			warn(tempname);
  			(void)rm(tempname);
  			relsesigs();
  			reset(0);
--- 474,480 ----
  		(void)Fclose(ibuf);
  		(void)Fclose(obuf);
  		if ((ibuf = Fopen(tempname, "r")) == NULL) {
! 			warn("%s", tempname);
  			(void)rm(tempname);
  			relsesigs();
  			reset(0);
***************
*** 484,490 ****
  	printf("\"%s\" ", mailname);
  	fflush(stdout);
  	if ((obuf = Fopen(mailname, "r+")) == NULL) {
! 		warn(mailname);
  		relsesigs();
  		reset(0);
  	}
--- 484,490 ----
  	printf("\"%s\" ", mailname);
  	fflush(stdout);
  	if ((obuf = Fopen(mailname, "r+")) == NULL) {
! 		warn("%s", mailname);
  		relsesigs();
  		reset(0);
  	}
***************
*** 495,501 ****
  			continue;
  		c++;
  		if (sendmessage(mp, obuf, NULL, NULL) < 0) {
! 			warn(mailname);
  			relsesigs();
  			reset(0);
  		}
--- 495,501 ----
  			continue;
  		c++;
  		if (sendmessage(mp, obuf, NULL, NULL) < 0) {
! 			warn("%s", mailname);
  			relsesigs();
  			reset(0);
  		}
***************
*** 508,514 ****
  	}
  	fflush(obuf);
  	if (ferror(obuf)) {
! 		warn(mailname);
  		relsesigs();
  		reset(0);
  	}
--- 508,514 ----
  	}
  	fflush(obuf);
  	if (ferror(obuf)) {
! 		warn("%s", mailname);
  		relsesigs();
  		reset(0);
  	}