===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tset/Attic/misc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/tset/Attic/misc.c	1997/07/25 21:05:45	1.3
--- src/usr.bin/tset/Attic/misc.c	1997/07/25 22:13:24	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: misc.c,v 1.3 1997/07/25 21:05:45 mickey Exp $	*/
  /*	$NetBSD: misc.c,v 1.3 1994/12/07 05:08:09 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: misc.c,v 1.4 1997/07/25 22:13:24 mickey Exp $	*/
  /*	$NetBSD: misc.c,v 1.3 1994/12/07 05:08:09 jtc Exp $	*/
  
  /*-
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
  #endif
! static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1997/07/25 21:05:45 mickey Exp $";
  #endif /* not lint */
  
  #include <fcntl.h>
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
  #endif
! static char rcsid[] = "$OpenBSD: misc.c,v 1.4 1997/07/25 22:13:24 mickey Exp $";
  #endif /* not lint */
  
  #include <fcntl.h>
***************
*** 47,52 ****
--- 47,53 ----
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
+ #include <err.h>
  #include "extern.h"
  
  void
***************
*** 57,69 ****
  	char buf[1024];
  
  	if ((fd = open(file, O_RDONLY, 0)) < 0)
! 		err("%s: %s", file, strerror(errno));
  
  	while ((nr = read(fd, buf, sizeof(buf))) > 0)
  		if ((nw = write(STDERR_FILENO, buf, nr)) == -1)
! 			err("write to stderr: %s", strerror(errno));
  	if (nr != 0)
! 		err("%s: %s", file, strerror(errno));
  	(void)close(fd);
  }
  
--- 58,70 ----
  	char buf[1024];
  
  	if ((fd = open(file, O_RDONLY, 0)) < 0)
! 		err(1, file);
  
  	while ((nr = read(fd, buf, sizeof(buf))) > 0)
  		if ((nw = write(STDERR_FILENO, buf, nr)) == -1)
! 			err(1, "write to stderr");
  	if (nr != 0)
! 		err(1, file);
  	(void)close(fd);
  }
  
***************
*** 72,104 ****
  	int c;
  {
  	(void)putc(c, stderr);
- }
- 
- #ifdef __STDC__
- #include <stdarg.h>
- #else
- #include <varargs.h>
- #endif
- 
- void
- #ifdef __STDC__
- err(const char *fmt, ...)
- #else
- err(fmt, va_alist)
- 	char *fmt;
-         va_dcl
- #endif
- {
- 	va_list ap;
- #ifdef __STDC__
- 	va_start(ap, fmt);
- #else
- 	va_start(ap);
- #endif
- 	(void)fprintf(stderr, "tset: ");
- 	(void)vfprintf(stderr, fmt, ap);
- 	va_end(ap);
- 	(void)fprintf(stderr, "\n");
- 	exit(1);
- 	/* NOTREACHED */
  }
--- 73,76 ----