===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/calendar/calendar.c	2002/02/16 21:27:44	1.17
--- src/usr.bin/calendar/calendar.c	2002/06/23 03:07:21	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: calendar.c,v 1.17 2002/02/16 21:27:44 millert Exp $	*/
  
  /*
   * Copyright (c) 1989, 1993, 1994
--- 1,4 ----
! /*	$OpenBSD: calendar.c,v 1.18 2002/06/23 03:07:21 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1989, 1993, 1994
***************
*** 43,49 ****
  #if 0
  static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
  #else
! static char rcsid[] = "$OpenBSD: calendar.c,v 1.17 2002/02/16 21:27:44 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
  #else
! static char rcsid[] = "$OpenBSD: calendar.c,v 1.18 2002/06/23 03:07:21 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 190,197 ****
  				(void)setlocale(LC_ALL, "");
  				if (setusercontext(NULL, pw, pw->pw_uid,
  				    LOGIN_SETALL ^ LOGIN_SETLOGIN))
! 					err(1, "unable to set user context (uid %d)",
! 					    (int)pw->pw_uid);
  				if (acstat) {
  					if (chdir(pw->pw_dir) ||
  					    stat(calendarFile, &sbuf) != 0 ||
--- 190,197 ----
  				(void)setlocale(LC_ALL, "");
  				if (setusercontext(NULL, pw, pw->pw_uid,
  				    LOGIN_SETALL ^ LOGIN_SETLOGIN))
! 					err(1, "unable to set user context (uid %u)",
! 					    pw->pw_uid);
  				if (acstat) {
  					if (chdir(pw->pw_dir) ||
  					    stat(calendarFile, &sbuf) != 0 ||
***************
*** 233,243 ****
  				 * if there's only a zombie now.
  				 */
  				(void)kill(kid, SIGTERM);
! 				warnx("uid %d did not finish in time", (int)pw->pw_uid);
  			}
  			if (time(NULL) - t >= SECSPERDAY)
! 				errx(2, "'calendar -a' took more than a day; stopped at uid %d",
! 				    (int)pw->pw_uid);
  		}
  		for (;;) {
  			deadkid = waitpid(-1, &kidstat, WNOHANG);
--- 233,243 ----
  				 * if there's only a zombie now.
  				 */
  				(void)kill(kid, SIGTERM);
! 				warnx("uid %u did not finish in time", pw->pw_uid);
  			}
  			if (time(NULL) - t >= SECSPERDAY)
! 				errx(2, "'calendar -a' took more than a day; stopped at uid %u",
! 				    pw->pw_uid);
  		}
  		for (;;) {
  			deadkid = waitpid(-1, &kidstat, WNOHANG);