===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/from/from.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/from/from.c	2003/06/10 22:20:46	1.10
--- src/usr.bin/from/from.c	2005/11/14 15:30:34	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: from.c,v 1.10 2003/06/10 22:20:46 deraadt Exp $	*/
  /*	$NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: from.c,v 1.11 2005/11/14 15:30:34 deraadt Exp $	*/
  /*	$NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: from.c,v 1.10 2003/06/10 22:20:46 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: from.c,v 1.11 2005/11/14 15:30:34 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 102,117 ****
  					errx(1, "no password file entry for you");
  				if ((file = getenv("USER"))) {
  					(void)snprintf(buf, sizeof(buf),
! 						"%s/%s", _PATH_MAILDIR, file);
  					file = buf;
  				} else
  					(void)snprintf(file = buf, sizeof(buf),
! 						"%s/%s", _PATH_MAILDIR,
! 					        pwd->pw_name);
  			}
  		} else {
  			(void)snprintf(buf, sizeof(buf), "%s/%s",
! 				_PATH_MAILDIR, file);
  			file = buf;
  		}
  	}
--- 102,117 ----
  					errx(1, "no password file entry for you");
  				if ((file = getenv("USER"))) {
  					(void)snprintf(buf, sizeof(buf),
! 					    "%s/%s", _PATH_MAILDIR, file);
  					file = buf;
  				} else
  					(void)snprintf(file = buf, sizeof(buf),
! 					    "%s/%s", _PATH_MAILDIR,
! 					    pwd->pw_name);
  			}
  		} else {
  			(void)snprintf(buf, sizeof(buf), "%s/%s",
! 			    _PATH_MAILDIR, file);
  			file = buf;
  		}
  	}