===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/rcs/rcs.c	2006/04/26 02:55:13	1.1
--- src/usr.bin/rcs/rcs.c	2006/04/26 15:08:25	1.2
***************
*** 1,4 ****
! /*	$OpenBSD: rcs.c,v 1.1 2006/04/26 02:55:13 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcs.c,v 1.2 2006/04/26 15:08:25 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 399,410 ****
  
  	strlcpy(fn, "/tmp/rcs.XXXXXXXXXX", sizeof(fn));
  	if ((fd = mkstemp(fn)) == -1)
! 		err(1, "mkstemp: `%s'", fn);
  
  	if ((fp = fdopen(fd, "w+")) == NULL) {
! 		fd = errno;
! 		unlink(fn);
! 		err(1, "fdopen: %s", fn);
  	}
  
  	if (rfp->rf_head != NULL)
--- 399,409 ----
  
  	strlcpy(fn, "/tmp/rcs.XXXXXXXXXX", sizeof(fn));
  	if ((fd = mkstemp(fn)) == -1)
! 		err(1, "%s", fn);
  
  	if ((fp = fdopen(fd, "w+")) == NULL) {
! 		(void)unlink(fn);
! 		err(1, "%s", fn);
  	}
  
  	if (rfp->rf_head != NULL)
***************
*** 1733,1739 ****
  	pdp->rp_pttype = RCS_TOK_ERR;
  
  	if ((pdp->rp_file = fopen(rfp->rf_path, "r")) == NULL)
! 		err(1, "fopen: `%s'", rfp->rf_path);
  
  	pdp->rp_buf = xmalloc((size_t)RCS_BUFSIZE);
  	pdp->rp_blen = RCS_BUFSIZE;
--- 1732,1738 ----
  	pdp->rp_pttype = RCS_TOK_ERR;
  
  	if ((pdp->rp_file = fopen(rfp->rf_path, "r")) == NULL)
! 		err(1, "%s", rfp->rf_path);
  
  	pdp->rp_buf = xmalloc((size_t)RCS_BUFSIZE);
  	pdp->rp_blen = RCS_BUFSIZE;