d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Y2K fix. at(1) would die with 'garbled time' when assign_date() was

Browse Source 
pased a year > 99.  This change fixes the conversion of 2-digit years
into tm_year format.

This change is differs from the OpenBSD fix because of differences
in our assign_date().

PR:		15872
Reported by:	"Crist J. Clark" <cjclark@home.com>
Submitted by:	"Sergey N. Voronkov" <serg@dor.zaural.ru>
Obtained from:	OpenBSD
This commit is contained in:
Sheldon Hearn 2000-03-27 09:32:23 +00:00
parent 263dcd2e0e
commit f4510294cb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=58660
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
usr.bin/at/parsetime.c
View File

@ -399,27 +399,29 @@ tod(struct tm *tm)
static void
assign_date(struct tm *tm, long mday, long mon, long year)
{
if (year > 99) {
if (year > 1899)
year -= 1900;
else
panic("garbled time");
} else if (year != -1) {
struct tm *lt;
time_t now;
time(&now);
lt = localtime(&now);
/*
* Convert year into tm_year format (year - 1900).
* We may be given the year in 2 digit, 4 digit, or tm_year format.
*/
if (year != -1) {
if (year >= 1900)
year -= 1900; /* convert from 4 digit year */
else if (year < 100) {
/* convert from 2 digit year */
struct tm *lt;
time_t now;
/*
* check if the specified year is in the next century.
* allow for one year of user error as many people will
* enter n - 1 at the start of year n.
*/
if (year < (lt->tm_year % 100) - 1)
year += 100;
/* adjust for the year 2000 and beyond */
year += lt->tm_year - (lt->tm_year % 100);
time(&now);
lt = localtime(&now);
/* Convert to tm_year assuming current century */
year += (lt->tm_year / 100) * 100;
if (year == lt->tm_year - 1) year++;
else if (year < lt->tm_year)
year += 100; /* must be in next century */
}
}
if (year < 0 &&