===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/names.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -c -r1.10 -r1.10.2.1
*** src/usr.bin/mail/names.c	2000/03/23 19:32:13	1.10
--- src/usr.bin/mail/names.c	2000/10/06 21:16:14	1.10.2.1
***************
*** 1,4 ****
! /*	$OpenBSD: names.c,v 1.10 2000/03/23 19:32:13 millert Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: names.c,v 1.10.2.1 2000/10/06 21:16:14 jason Exp $	*/
  /*	$NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: names.c,v 1.10 2000/03/23 19:32:13 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)names.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: names.c,v 1.10.2.1 2000/10/06 21:16:14 jason Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 260,273 ****
  			    "%s/mail.ReXXXXXXXXXX", tmpdir);
  			if ((fd = mkstemp(tempname)) == -1 ||
  			    (fout = Fdopen(fd, "a")) == NULL) {
! 				warn(tempname);
  				senderr++;
  				goto cant;
  			}
  			image = open(tempname, O_RDWR);
  			(void)rm(tempname);
  			if (image < 0) {
! 				warn(tempname);
  				senderr++;
  				(void)Fclose(fout);
  				goto cant;
--- 260,273 ----
  			    "%s/mail.ReXXXXXXXXXX", tmpdir);
  			if ((fd = mkstemp(tempname)) == -1 ||
  			    (fout = Fdopen(fd, "a")) == NULL) {
! 				warn("%s", tempname);
  				senderr++;
  				goto cant;
  			}
  			image = open(tempname, O_RDWR);
  			(void)rm(tempname);
  			if (image < 0) {
! 				warn("%s", tempname);
  				senderr++;
  				(void)Fclose(fout);
  				goto cant;
***************
*** 281,287 ****
  			(void)putc('\n', fout);
  			(void)fflush(fout);
  			if (ferror(fout))
! 				warn(tempname);
  			(void)Fclose(fout);
  		}
  
--- 281,287 ----
  			(void)putc('\n', fout);
  			(void)fflush(fout);
  			if (ferror(fout))
! 				warn("%s", tempname);
  			(void)Fclose(fout);
  		}
  
***************
*** 319,325 ****
  		} else {
  			int f;
  			if ((fout = Fopen(fname, "a")) == NULL) {
! 				warn(fname);
  				senderr++;
  				goto cant;
  			}
--- 319,325 ----
  		} else {
  			int f;
  			if ((fout = Fopen(fname, "a")) == NULL) {
! 				warn("%s", fname);
  				senderr++;
  				goto cant;
  			}
***************
*** 339,345 ****
  				(void)putc(c, fout);
  			if (ferror(fout)) {
  				senderr++;
! 				warn(fname);
  			}
  			(void)Fclose(fout);
  			(void)Fclose(fin);
--- 339,345 ----
  				(void)putc(c, fout);
  			if (ferror(fout)) {
  				senderr++;
! 				warn("%s", fname);
  			}
  			(void)Fclose(fout);
  			(void)Fclose(fin);