===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/send.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/mail/send.c	2000/04/26 15:47:31	1.10
--- src/usr.bin/mail/send.c	2000/06/30 16:00:18	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: send.c,v 1.10 2000/04/26 15:47:31 millert Exp $	*/
  /*	$NetBSD: send.c,v 1.6 1996/06/08 19:48:39 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: send.c,v 1.11 2000/06/30 16:00:18 millert Exp $	*/
  /*	$NetBSD: send.c,v 1.6 1996/06/08 19:48:39 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)send.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: send.c,v 1.10 2000/04/26 15:47:31 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)send.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: send.c,v 1.11 2000/06/30 16:00:18 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 385,391 ****
  		else
  			cp = _PATH_SENDMAIL;
  		execv(cp, namelist);
! 		warn(cp);
  		_exit(1);
  	}
  	if (value("verbose") != NULL)
--- 385,391 ----
  		else
  			cp = _PATH_SENDMAIL;
  		execv(cp, namelist);
! 		warn("%s", cp);
  		_exit(1);
  	}
  	if (value("verbose") != NULL)
***************
*** 439,449 ****
  	    "%s/mail.RsXXXXXXXXXX", tmpdir);
  	if ((fd = mkstemp(tempname)) == -1 ||
  	    (nfo = Fdopen(fd, "w")) == NULL) {
! 		warn(tempname);
  		return(fi);
  	}
  	if ((nfi = Fopen(tempname, "r")) == NULL) {
! 		warn(tempname);
  		(void)Fclose(nfo);
  		(void)rm(tempname);
  		return(fi);
--- 439,449 ----
  	    "%s/mail.RsXXXXXXXXXX", tmpdir);
  	if ((fd = mkstemp(tempname)) == -1 ||
  	    (nfo = Fdopen(fd, "w")) == NULL) {
! 		warn("%s", tempname);
  		return(fi);
  	}
  	if ((nfi = Fopen(tempname, "r")) == NULL) {
! 		warn("%s", tempname);
  		(void)Fclose(nfo);
  		(void)rm(tempname);
  		return(fi);
***************
*** 462,468 ****
  	}
  	(void)fflush(nfo);
  	if (ferror(nfo)) {
! 		warn(tempname);
  		(void)Fclose(nfo);
  		(void)Fclose(nfi);
  		rewind(fi);
--- 462,468 ----
  	}
  	(void)fflush(nfo);
  	if (ferror(nfo)) {
! 		warn("%s", tempname);
  		(void)Fclose(nfo);
  		(void)Fclose(nfi);
  		rewind(fi);
***************
*** 550,556 ****
  	time_t now;
  
  	if ((fo = Fopen(name, "a")) == NULL) {
! 		warn(name);
  		return(-1);
  	}
  	(void)time(&now);
--- 550,556 ----
  	time_t now;
  
  	if ((fo = Fopen(name, "a")) == NULL) {
! 		warn("%s", name);
  		return(-1);
  	}
  	(void)time(&now);
***************
*** 560,566 ****
  	(void)putc('\n', fo);
  	(void)fflush(fo);
  	if (ferror(fo))
! 		warn(name);
  	(void)Fclose(fo);
  	rewind(fi);
  	return(0);
--- 560,566 ----
  	(void)putc('\n', fo);
  	(void)fflush(fo);
  	if (ferror(fo))
! 		warn("%s", name);
  	(void)Fclose(fo);
  	rewind(fi);
  	return(0);