===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/finger/util.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/finger/util.c	1998/01/09 17:17:39	1.9
--- src/usr.bin/finger/util.c	1998/07/10 15:45:19	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.9 1998/01/09 17:17:39 millert Exp $	*/
  
  /*
   * Copyright (c) 1989 The Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.10 1998/07/10 15:45:19 mickey Exp $	*/
  
  /*
   * Copyright (c) 1989 The Regents of the University of California.
***************
*** 39,45 ****
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)util.c	5.14 (Berkeley) 1/17/91";*/
! static char rcsid[] = "$OpenBSD: util.c,v 1.9 1998/01/09 17:17:39 millert Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 39,45 ----
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)util.c	5.14 (Berkeley) 1/17/91";*/
! static char rcsid[] = "$OpenBSD: util.c,v 1.10 1998/07/10 15:45:19 mickey Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 56,61 ****
--- 56,62 ----
  #include <errno.h>
  #include <unistd.h>
  #include <vis.h>
+ #include <err.h>
  #include "finger.h"
  #include "extern.h"
  
***************
*** 113,120 ****
  	pn->mailrecv = -1;		/* -1 == not_valid */
  	if (stat(tbuf, &sb) < 0) {
  		if (errno != ENOENT) {
! 			(void)fprintf(stderr,
! 			    "finger: %s: %s\n", tbuf, strerror(errno));
  			return;
  		}
  	} else if (sb.st_size != 0) {
--- 114,120 ----
  	pn->mailrecv = -1;		/* -1 == not_valid */
  	if (stat(tbuf, &sb) < 0) {
  		if (errno != ENOENT) {
! 			warn(tbuf);
  			return;
  		}
  	} else if (sb.st_size != 0) {
***************
*** 304,313 ****
  {
  	PERSON *p;
  
! 	if ((p = (PERSON *)malloc((u_int) sizeof(PERSON))) == NULL) {
! 		(void)fprintf(stderr, "finger: out of space.\n");
! 		exit(1);
! 	}
  	return(p);
  }
  
--- 304,311 ----
  {
  	PERSON *p;
  
! 	if ((p = (PERSON *)malloc((u_int) sizeof(PERSON))) == NULL)
! 		err(1, "malloc");
  	return(p);
  }
  
***************
*** 317,326 ****
  {
  	WHERE *w;
  
! 	if ((w = (WHERE *)malloc((u_int) sizeof(WHERE))) == NULL) {
! 		(void)fprintf(stderr, "finger: out of space.\n");
! 		exit(1);
! 	}
  	if (pn->whead == NULL)
  		pn->whead = pn->wtail = w;
  	else {
--- 315,322 ----
  {
  	WHERE *w;
  
! 	if ((w = (WHERE *)malloc((u_int) sizeof(WHERE))) == NULL)
! 		err(1, "malloc");
  	if (pn->whead == NULL)
  		pn->whead = pn->wtail = w;
  	else {