diff options
Diffstat (limited to 'src/usr.bin/calendar/day.c')
| -rw-r--r-- | src/usr.bin/calendar/day.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/usr.bin/calendar/day.c b/src/usr.bin/calendar/day.c index 4a164ba..703be4d 100644 --- a/src/usr.bin/calendar/day.c +++ b/src/usr.bin/calendar/day.c @@ -1,4 +1,4 @@ -/* $OpenBSD: day.c,v 1.27 2013/11/26 13:18:53 deraadt Exp $ */ +/* $OpenBSD: day.c,v 1.29 2015/03/17 19:31:30 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" @@ -157,7 +156,7 @@ settime(time_t *now) tp->tm_isdst = 0; tp->tm_hour = 12; *now = mktime(tp); - if (isleap(tp->tm_year + TM_YEAR_BASE)) + if (isleap(tp->tm_year + 1900)) cumdays = daytab[1]; else cumdays = daytab[0]; @@ -215,13 +214,10 @@ Mktime(char *date) *(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.tm_year += 100; + else if (tm.tm_year > 1900) + tm.tm_year -= 1900; } #if DEBUG @@ -431,16 +427,16 @@ isnow(char *endp, int bodun) */ if (tp->tm_yday > 300 && tmtmp.tm_mon <= 1) variable_weekday(&vwd, tmtmp.tm_mon + 1, - tmtmp.tm_year + TM_YEAR_BASE + 1); + tmtmp.tm_year + 1900 + 1); else variable_weekday(&vwd, tmtmp.tm_mon + 1, - tmtmp.tm_year + TM_YEAR_BASE); + tmtmp.tm_year + 1900); day = cumdays[tmtmp.tm_mon + 1] + vwd; tmtmp.tm_mday = vwd; } v2 = day - tp->tm_yday; if ((v2 > v1) || (v2 < 0)) { - if ((v2 += isleap(tp->tm_year + TM_YEAR_BASE) ? 366 : 365) + if ((v2 += isleap(tp->tm_year + 1900) ? 366 : 365) <= v1) tmtmp.tm_year++; else if(!bodun || (day - tp->tm_yday) != -1) @@ -516,7 +512,7 @@ isnow(char *endp, int bodun) if (vwd) { v1 = vwd; variable_weekday(&v1, tmtmp.tm_mon + 1, - tmtmp.tm_year + TM_YEAR_BASE); + tmtmp.tm_year + 1900); tmtmp.tm_mday = v1; } else tmtmp.tm_mday = dayp; @@ -527,11 +523,11 @@ isnow(char *endp, int bodun) if (flags & F_SPECIAL) { tmtmp.tm_mon = 0; /* Gee, mktime() is nice */ tmtmp.tm_mday = spev[v1].getev(tmtmp.tm_year + - TM_YEAR_BASE) + vwd; + 1900) + vwd; } else if (vwd) { v1 = vwd; variable_weekday(&v1, tmtmp.tm_mon + 1, - tmtmp.tm_year + TM_YEAR_BASE); + tmtmp.tm_year + 1900); tmtmp.tm_mday = v1; } else { /* Need the following to keep Feb 29 from |