D17550.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D17550.id.diff
View Options

	Index: head/lib/libc/stdtime/strptime.c
	===================================================================
	--- head/lib/libc/stdtime/strptime.c
	+++ head/lib/libc/stdtime/strptime.c
	@@ -95,6 +95,7 @@
	int i, len;
	int flags;
	int Ealternative, Oalternative;
	+ int century, year;
	const struct lc_time_T *tptr = __get_current_time_locale(locale);
	static int start_of_month[2][13] = {
	{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
	@@ -102,6 +103,8 @@
	};

	flags = FLAG_NONE;
	+ century = -1;
	+ year = -1;

	ptr = fmt;
	while (*ptr != 0) {
	@@ -146,10 +149,8 @@
	i += *buf - '0';
	len--;
	}
	- if (i < 19)
	- return (NULL);

	- tm->tm_year = i * 100 - TM_YEAR_BASE;
	+ century = i;
	flags \|= FLAG_YEAR;

	break;
	@@ -527,13 +528,9 @@
	len--;
	}
	if (c == 'Y')
	- i -= TM_YEAR_BASE;
	- if (c == 'y' && i < 69)
	- i += 100;
	- if (i < 0)
	- return (NULL);
	+ century = i / 100;
	+ year = i % 100;

	- tm->tm_year = i;
	flags \|= FLAG_YEAR;

	break;
	@@ -609,6 +606,17 @@
	default:
	return (NULL);
	}
	+ }
	+
	+ if (century != -1 \|\| year != -1) {
	+ if (year == -1)
	+ year = 0;
	+ if (century == -1) {
	+ if (year < 69)
	+ year += 100;
	+ } else
	+ year += century * 100 - TM_YEAR_BASE;
	+ tm->tm_year = year;
	}

	if (!(flags & FLAG_YDAY) && (flags & FLAG_YEAR)) {