===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/day.c,v
retrieving revision 1.19
retrieving revision 1.23
diff -u -r1.19 -r1.23
--- src/usr.bin/calendar/day.c	2005/08/09 12:32:58	1.19
+++ src/usr.bin/calendar/day.c	2010/04/28 18:20:15	1.23
@@ -1,4 +1,4 @@
-/*	$OpenBSD: day.c,v 1.19 2005/08/09 12:32:58 mickey Exp $	*/
+/*	$OpenBSD: day.c,v 1.23 2010/04/28 18:20:15 jsg Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -29,20 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
-#else
-static const char rcsid[] = "$OpenBSD: day.c,v 1.19 2005/08/09 12:32:58 mickey Exp $";
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <sys/uio.h>
 
@@ -58,6 +44,8 @@
 #include "pathnames.h"
 #include "calendar.h"
 
+extern struct iovec header[];
+
 #define WEEKLY 1
 #define MONTHLY 2
 #define YEARLY 3
@@ -91,7 +79,8 @@
 static struct fixs nmonths[13];       /* short national month names */
 
 
-void setnnames(void)
+void
+setnnames(void)
 {
 	char buf[80];
 	int i, l;
@@ -160,8 +149,7 @@
 }
 
 void
-settime(now)
-	time_t *now;
+settime(time_t *now)
 {
 	tp = localtime(now);
 	tp->tm_sec = 0;
@@ -190,57 +178,57 @@
 /* convert [Year][Month]Day into unix time (since 1970)
  * Year: two or four digits, Month: two digits, Day: two digits
  */
-time_t Mktime (date)
-    char *date;
+time_t
+Mktime(char *date)
 {
-    time_t t;
-    int len;
-    struct tm tm;
+	time_t t;
+	int len;
+	struct tm tm;
 
-    (void)time(&t);
-    tp = localtime(&t);
+	(void)time(&t);
+	tp = localtime(&t);
 
-    len = strlen(date);
-    if (len < 2)
-	return((time_t)-1);
-    tm.tm_sec = 0;
-    tm.tm_min = 0;
-    /* Avoid getting caught by a timezone shift; set time to noon */
-    tm.tm_isdst = 0;
-    tm.tm_hour = 12;
-    tm.tm_wday = 0;
-    tm.tm_mday = tp->tm_mday;
-    tm.tm_mon = tp->tm_mon;
-    tm.tm_year = tp->tm_year;
+	len = strlen(date);
+	if (len < 2)
+		return((time_t)-1);
+	tm.tm_sec = 0;
+	tm.tm_min = 0;
+	/* Avoid getting caught by a timezone shift; set time to noon */
+	tm.tm_isdst = 0;
+	tm.tm_hour = 12;
+	tm.tm_wday = 0;
+	tm.tm_mday = tp->tm_mday;
+	tm.tm_mon = tp->tm_mon;
+	tm.tm_year = tp->tm_year;
 
-    /* Day */
-    tm.tm_mday = atoi(date + len - 2);
+	/* Day */
+	tm.tm_mday = atoi(date + len - 2);
 
-    /* Month */
-    if (len >= 4) {
-	*(date + len - 2) = '\0';
-	tm.tm_mon = atoi(date + len - 4) - 1;
-    }
+	/* Month */
+	if (len >= 4) {
+		*(date + len - 2) = '\0';
+		tm.tm_mon = atoi(date + len - 4) - 1;
+	}
 
-    /* Year */
-    if (len >= 6) {
+	/* Year */
+	if (len >= 6) {
 		*(date + len - 4) = '\0';
 		tm.tm_year = atoi(date);
 
-	/* tm_year up TM_YEAR_BASE ... */
-	if (tm.tm_year < 69)		/* Y2K */
-		tm.tm_year += 2000 - TM_YEAR_BASE;
-	else if (tm.tm_year < 100)
-		tm.tm_year += 1900 - TM_YEAR_BASE;
-	else if (tm.tm_year > TM_YEAR_BASE)
-		tm.tm_year -= TM_YEAR_BASE;
-    }
+		/* tm_year up TM_YEAR_BASE ... */
+		if (tm.tm_year < 69)		/* Y2K */
+			tm.tm_year += 2000 - TM_YEAR_BASE;
+		else if (tm.tm_year < 100)
+			tm.tm_year += 1900 - TM_YEAR_BASE;
+		else if (tm.tm_year > TM_YEAR_BASE)
+			tm.tm_year -= TM_YEAR_BASE;
+	}
 
 #if DEBUG
-    printf("Mktime: %d %d %d %s\n", (int)mktime(&tm), (int)t, len,
-	   asctime(&tm));
+	printf("Mktime: %d %d %d %s\n", (int)mktime(&tm), (int)t, len,
+	    asctime(&tm));
 #endif
-    return(mktime(&tm));
+	return(mktime(&tm));
 }
 
 void
@@ -274,9 +262,7 @@
  * with \t, is shown along with the matched line.
  */
 struct match *
-isnow(endp, bodun)
-	char	*endp;
-	int	bodun;
+isnow(char *endp, int bodun)
 {
 	int day = 0, flags = 0, month = 0, v1, v2, i;
 	int monthp, dayp, varp = 0;
@@ -303,7 +289,7 @@
 
 	/* adjust bodun rate */
 	if (bodun && !bodun_always)
-		bodun = !(arc4random() % 3);
+		bodun = !arc4random_uniform(3);
 		
 	/* Easter or Easter depending days */
 	if (flags & F_SPECIAL)
@@ -592,8 +578,7 @@
 
 
 int
-getmonth(s)
-	char *s;
+getmonth(char *s)
 {
 	char **p;
 	struct fixs *n;
@@ -612,8 +597,7 @@
 
 
 int
-getday(s)
-	char *s;
+getday(char *s)
 {
 	char **p;
 	struct fixs *n;
@@ -636,8 +620,7 @@
  * ... etc ...
  */
 int
-getdayvar(s)
-	char *s;
+getdayvar(char *s)
 {
 	int offset;
 
@@ -677,8 +660,7 @@
 
 
 int
-foy(year)
-	int year;
+foy(int year)
 {
 	/* 0-6; what weekday Jan 1 is */
 	year--;
@@ -688,8 +670,7 @@
 
 
 void
-variable_weekday(day, month, year)
-	int *day, month, year;
+variable_weekday(int *day, int month, int year)
 {
 	int v1, v2;
 	int *cumdays;