===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/lex.c,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -c -r1.19 -r1.19.2.1
*** src/usr.bin/mail/lex.c	2000/04/25 16:42:22	1.19
--- src/usr.bin/mail/lex.c	2000/10/06 21:16:15	1.19.2.1
***************
*** 1,4 ****
! /*	$OpenBSD: lex.c,v 1.19 2000/04/25 16:42:22 millert Exp $	*/
  /*	$NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: lex.c,v 1.19.2.1 2000/10/06 21:16:15 jason Exp $	*/
  /*	$NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: lex.c,v 1.19 2000/04/25 16:42:22 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)lex.c	8.2 (Berkeley) 4/20/95";
  #else
! static char rcsid[] = "$OpenBSD: lex.c,v 1.19.2.1 2000/10/06 21:16:15 jason Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 79,85 ****
  	if ((ibuf = Fopen(name, "r")) == NULL) {
  		if (!isedit && errno == ENOENT)
  			goto nomail;
! 		warn(name);
  		return(-1);
  	}
  
--- 79,85 ----
  	if ((ibuf = Fopen(name, "r")) == NULL) {
  		if (!isedit && errno == ENOENT)
  			goto nomail;
! 		warn("%s", name);
  		return(-1);
  	}
  
***************
*** 93,99 ****
  	case S_IFDIR:
  		(void)Fclose(ibuf);
  		errno = EISDIR;
! 		warn(name);
  		return(-1);
  
  	case S_IFREG:
--- 93,99 ----
  	case S_IFDIR:
  		(void)Fclose(ibuf);
  		errno = EISDIR;
! 		warn("%s", name);
  		return(-1);
  
  	case S_IFREG:
***************
*** 102,108 ****
  	default:
  		(void)Fclose(ibuf);
  		errno = EINVAL;
! 		warn(name);
  		return(-1);
  	}
  
--- 102,108 ----
  	default:
  		(void)Fclose(ibuf);
  		errno = EINVAL;
! 		warn("%s", name);
  		return(-1);
  	}
  
***************
*** 143,152 ****
  	    "%s/mail.RxXXXXXXXXXX", tmpdir);
  	if ((fd = mkstemp(tempname)) == -1 ||
  	    (otf = fdopen(fd, "w")) == NULL)
! 		err(1, tempname);
  	(void)fcntl(fileno(otf), F_SETFD, 1);
  	if ((itf = fopen(tempname, "r")) == NULL)
! 		err(1, tempname);
  	(void)fcntl(fileno(itf), F_SETFD, 1);
  	(void)rm(tempname);
  	setptr(ibuf, 0);
--- 143,152 ----
  	    "%s/mail.RxXXXXXXXXXX", tmpdir);
  	if ((fd = mkstemp(tempname)) == -1 ||
  	    (otf = fdopen(fd, "w")) == NULL)
! 		err(1, "%s", tempname);
  	(void)fcntl(fileno(otf), F_SETFD, 1);
  	if ((itf = fopen(tempname, "r")) == NULL)
! 		err(1, "%s", tempname);
  	(void)fcntl(fileno(itf), F_SETFD, 1);
  	(void)rm(tempname);
  	setptr(ibuf, 0);