===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/calendar/calendar.c	2005/08/09 12:32:58	1.24
--- src/usr.bin/calendar/calendar.c	2005/11/16 16:45:11	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: calendar.c,v 1.24 2005/08/09 12:32:58 mickey Exp $	*/
  
  /*
   * Copyright (c) 1989, 1993, 1994
--- 1,4 ----
! /*	$OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1989, 1993, 1994
***************
*** 39,45 ****
  #if 0
  static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
  #else
! static const char rcsid[] = "$OpenBSD: calendar.c,v 1.24 2005/08/09 12:32:58 mickey Exp $";
  #endif
  #endif /* not lint */
  
--- 39,45 ----
  #if 0
  static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
  #else
! static const char rcsid[] = "$OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 232,238 ****
  				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 (;;) {
--- 232,239 ----
  				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 (;;) {
***************
*** 242,251 ****
  			runningkids--;
  		}
  		if (runningkids)
! 			warnx(
! "%d child processes still running when 'calendar -a' finished", runningkids);
! 	}
! 	else if ((caldir = getenv("CALENDAR_DIR")) != NULL) {
  		if(!chdir(caldir))
  			cal();
  	} else
--- 243,251 ----
  			runningkids--;
  		}
  		if (runningkids)
! 			warnx("%d child processes still running when "
! 			    "'calendar -a' finished", runningkids);
! 	} else if ((caldir = getenv("CALENDAR_DIR")) != NULL) {
  		if(!chdir(caldir))
  			cal();
  	} else