===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mail/v7.local.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/mail/v7.local.c	1997/07/13 21:21:18	1.7
--- src/usr.bin/mail/v7.local.c	1997/07/14 00:24:31	1.8
***************
*** 1,4 ****
! /*	$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 $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: v7.local.c,v 1.8 1997/07/14 00:24:31 millert Exp $	*/
  /*	$NetBSD: v7.local.c,v 1.8 1997/05/13 06:15:58 mikel Exp $	*/
  
  /*
***************
*** 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 */
  
--- 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.8 1997/07/14 00:24:31 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 81,87 ****
  demail()
  {
  
! 	if (value("keep") != NOSTR || rm(mailname) < 0)
  		(void)close(creat(mailname, 0600));
  }
  
--- 81,87 ----
  demail()
  {
  
! 	if (value("keep") != NULL || rm(mailname) < 0)
  		(void)close(creat(mailname, 0600));
  }
  
***************
*** 94,105 ****
  	char *np;
  	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);
  }
--- 94,105 ----
  	char *np;
  	uid_t uid;
  
! 	if ((np = getenv("USER")) != NULL)
  		return(np);
! 	if ((np = getenv("LOGNAME")) != NULL)
  		return(np);
! 	if ((np = getname(uid = getuid())) != NULL)
  		return(np);
  	printf("Cannot associate a name with uid %u\n", (unsigned)uid);
! 	return(NULL);
  }