===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/login/login.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/login/login.c	2009/08/03 21:43:07	1.58
--- src/usr.bin/login/login.c	2009/08/31 22:25:43	1.59
***************
*** 1,4 ****
! /*	$OpenBSD: login.c,v 1.58 2009/08/03 21:43:07 martynas Exp $	*/
  /*	$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: login.c,v 1.59 2009/08/31 22:25:43 martynas Exp $	*/
  /*	$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $	*/
  
  /*-
***************
*** 73,79 ****
  #if 0
  static const char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
  #endif
! static const char rcsid[] = "$OpenBSD: login.c,v 1.58 2009/08/03 21:43:07 martynas Exp $";
  #endif /* not lint */
  
  /*
--- 73,79 ----
  #if 0
  static const char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
  #endif
! static const char rcsid[] = "$OpenBSD: login.c,v 1.59 2009/08/31 22:25:43 martynas Exp $";
  #endif /* not lint */
  
  /*
***************
*** 153,158 ****
--- 153,159 ----
  	char *lipaddr, *script, *ripaddr, *style, *type, *fqdn;
  	char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
  	char localhost[MAXHOSTNAMELEN], *copyright;
+ 	char mail[sizeof(_PATH_MAILDIR) + 1 + NAME_MAX];
  	int ask, ch, cnt, fflag, pflag, quietlog, rootlogin, lastchance;
  	int error, homeless, needto, authok, tries, backoff;
  	struct addrinfo *ai, hints;
***************
*** 606,614 ****
  	}
  	if (term[0] == '\0')
  		(void)strlcpy(term, stypeof(tty), sizeof(term));
  	if (setenv("TERM", term, 0) == -1 ||
  	    setenv("LOGNAME", pwd->pw_name, 1) == -1 ||
! 	    setenv("USER", pwd->pw_name, 1) == -1) {
  		warn("unable to setenv()");
  		quickexit(1);
  	}
--- 607,618 ----
  	}
  	if (term[0] == '\0')
  		(void)strlcpy(term, stypeof(tty), sizeof(term));
+ 	(void)snprintf(mail, sizeof(mail), "%s/%s", _PATH_MAILDIR,
+ 		pwd->pw_name);
  	if (setenv("TERM", term, 0) == -1 ||
  	    setenv("LOGNAME", pwd->pw_name, 1) == -1 ||
! 	    setenv("USER", pwd->pw_name, 1) == -1 ||
! 	    setenv("MAIL", mail, 1) == -1) {
  		warn("unable to setenv()");
  		quickexit(1);
  	}
***************
*** 704,712 ****
  		    login_getcapstr(lc, "copyright", NULL, NULL)) != NULL)
  			auth_cat(copyright);
  		motd();
! 		(void)snprintf(tbuf,
! 		    sizeof(tbuf), "%s/%s", _PATH_MAILDIR, pwd->pw_name);
! 		if (stat(tbuf, &st) == 0 && st.st_size != 0)
  			(void)printf("You have %smail.\n",
  			    (st.st_mtime > st.st_atime) ? "new " : "");
  	}
--- 708,714 ----
  		    login_getcapstr(lc, "copyright", NULL, NULL)) != NULL)
  			auth_cat(copyright);
  		motd();
! 		if (stat(mail, &st) == 0 && st.st_size != 0)
  			(void)printf("You have %smail.\n",
  			    (st.st_mtime > st.st_atime) ? "new " : "");
  	}