===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/v7.local.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/mail/v7.local.c	1997/06/16 20:57:06	1.6
--- src/usr.bin/mail/v7.local.c	1997/07/13 21:21:18	1.7
***************
*** 1,5 ****
! /*	$OpenBSD: v7.local.c,v 1.6 1997/06/16 20:57:06 millert Exp $	*/
! /*	$NetBSD: v7.local.c,v 1.7 1996/06/08 19:48:44 christos Exp $	*/
  
  /*
   * Copyright (c) 1980, 1993
--- 1,5 ----
! /*	$OpenBSD: v7.local.c,v 1.7 1997/07/13 21:21:18 millert Exp $	*/
! /*	$NetBSD: v7.local.c,v 1.8 1997/05/13 06:15:58 mikel Exp $	*/
  
  /*
   * Copyright (c) 1980, 1993
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)v7.local.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: v7.local.c,v 1.6 1997/06/16 20:57:06 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)v7.local.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: v7.local.c,v 1.7 1997/07/13 21:21:18 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 82,88 ****
  {
  
  	if (value("keep") != NOSTR || rm(mailname) < 0)
! 		close(creat(mailname, 0600));
  }
  
  /*
--- 82,88 ----
  {
  
  	if (value("keep") != NOSTR || rm(mailname) < 0)
! 		(void)close(creat(mailname, 0600));
  }
  
  /*
***************
*** 95,105 ****
  	uid_t uid;
  
  	if ((np = getenv("USER")) != NOSTR)
! 		return np;
  	if ((np = getenv("LOGNAME")) != NOSTR)
! 		return np;
  	if ((np = getname(uid = getuid())) != NOSTR)
! 		return np;
  	printf("Cannot associate a name with uid %u\n", (unsigned)uid);
! 	return NOSTR;
  }
--- 95,105 ----
  	uid_t uid;
  
  	if ((np = getenv("USER")) != NOSTR)
! 		return(np);
  	if ((np = getenv("LOGNAME")) != NOSTR)
! 		return(np);
  	if ((np = getname(uid = getuid())) != NOSTR)
! 		return(np);
  	printf("Cannot associate a name with uid %u\n", (unsigned)uid);
! 	return(NOSTR);
  }