===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.c,v
retrieving revision 1.22
retrieving revision 1.25
diff -u -r1.22 -r1.25
--- src/usr.bin/calendar/calendar.c	2003/09/09 08:39:53	1.22
+++ src/usr.bin/calendar/calendar.c	2005/11/16 16:45:11	1.25
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.c,v 1.22 2003/09/09 08:39:53 jmc Exp $	*/
+/*	$OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: calendar.c,v 1.22 2003/09/09 08:39:53 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: calendar.c,v 1.25 2005/11/16 16:45:11 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -73,6 +73,7 @@
 
 int f_dayAfter = 0; /* days after current date */
 int f_dayBefore = 0; /* days before current date */
+int f_SetdayAfter = 0; /* calendar invoked with -A */
 
 struct specialev spev[NUMEV];
 
@@ -110,6 +111,7 @@
 
 		case 'A': /* days after current date */
 			f_dayAfter = atoi(optarg);
+			f_SetdayAfter = 1;
 			break;
 
 		case 'B': /* days before current date */
@@ -230,7 +232,8 @@
 				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",
+				errx(2, "'calendar -a' took more than a day; "
+				    "stopped at uid %u",
 				    pw->pw_uid);
 		}
 		for (;;) {
@@ -240,10 +243,9 @@
 			runningkids--;
 		}
 		if (runningkids)
-			warnx(
-"%d child processes still running when 'calendar -a' finished", runningkids);
-	}
-	else if ((caldir = getenv("CALENDAR_DIR")) != NULL) {
+			warnx("%d child processes still running when "
+			    "'calendar -a' finished", runningkids);
+	} else if ((caldir = getenv("CALENDAR_DIR")) != NULL) {
 		if(!chdir(caldir))
 			cal();
 	} else