===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/day.c,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -r1.24 -r1.28
--- src/usr.bin/calendar/day.c	2013/04/02 04:40:21	1.24
+++ src/usr.bin/calendar/day.c	2015/03/15 00:41:28	1.28
@@ -1,4 +1,4 @@
-/*	$OpenBSD: day.c,v 1.24 2013/04/02 04:40:21 deraadt Exp $	*/
+/*	$OpenBSD: day.c,v 1.28 2015/03/15 00:41:28 millert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -39,7 +39,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <tzfile.h>
 
 #include "pathnames.h"
 #include "calendar.h"
@@ -78,7 +77,6 @@
 static struct fixs fnmonths[13];      /* full national months names */
 static struct fixs nmonths[13];       /* short national month names */
 
-
 void
 setnnames(void)
 {
@@ -89,7 +87,7 @@
 	for (i = 0; i < 7; i++) {
 		tm.tm_wday = i;
 		l = strftime(buf, sizeof(buf), "%a", &tm);
-		for (; l > 0 && isspace((int)buf[l - 1]); l--)
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
 			;
 		buf[l] = '\0';
 		if (ndays[i].name != NULL)
@@ -99,7 +97,7 @@
 		ndays[i].len = strlen(buf);
 
 		l = strftime(buf, sizeof(buf), "%A", &tm);
-		for (; l > 0 && isspace((int)buf[l - 1]); l--)
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
 			;
 		buf[l] = '\0';
 		if (fndays[i].name != NULL)
@@ -112,7 +110,7 @@
 	for (i = 0; i < 12; i++) {
 		tm.tm_mon = i;
 		l = strftime(buf, sizeof(buf), "%b", &tm);
-		for (; l > 0 && isspace((int)buf[l - 1]); l--)
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
 			;
 		buf[l] = '\0';
 		if (nmonths[i].name != NULL)
@@ -122,7 +120,7 @@
 		nmonths[i].len = strlen(buf);
 
 		l = strftime(buf, sizeof(buf), "%B", &tm);
-		for (; l > 0 && isspace((int)buf[l - 1]); l--)
+		for (; l > 0 && isspace((unsigned char)buf[l - 1]); l--)
 			;
 		buf[l] = '\0';
 		if (fnmonths[i].name != NULL)
@@ -191,6 +189,7 @@
 	len = strlen(date);
 	if (len < 2)
 		return((time_t)-1);
+	bzero(&tm, sizeof tm);
 	tm.tm_sec = 0;
 	tm.tm_min = 0;
 	/* Avoid getting caught by a timezone shift; set time to noon */
@@ -231,7 +230,7 @@
 	return(mktime(&tm));
 }
 
-void
+static void
 adjust_calendar(int *day, int *month)
 {
 	switch (calendar) {