BUILD: fix build on Solaris 10/11
uint16_t instead of u_int16_t
None ISO fields of struct tm are not present, but
by zeroyfing it, on GNU and BSD systems tm_gmtoff
field will be set.
[wt: moved the memset into each of the date functions]
diff --git a/src/standard.c b/src/standard.c
index 41c54ac..afb2c83 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -3077,6 +3077,9 @@
*/
int parse_imf_date(const char *date, int len, struct tm *tm)
{
+ /* tm_gmtoff, if present, ought to be zero'ed */
+ memset(tm, 0, sizeof(*tm));
+
RET0_UNLESS(parse_http_dayname(&date, &len, tm)); /* day-name */
RET0_UNLESS(parse_expect_char(&date, &len, ',')); /* expect "," */
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
@@ -3091,7 +3094,6 @@
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
RET0_UNLESS(parse_strcmp(&date, &len, "GMT", 3)); /* GMT = %x47.4D.54 ; "GMT", case-sensitive */
tm->tm_isdst = -1;
- tm->tm_gmtoff = 0;
return 1;
}
@@ -3108,6 +3110,9 @@
{
int year;
+ /* tm_gmtoff, if present, ought to be zero'ed */
+ memset(tm, 0, sizeof(*tm));
+
RET0_UNLESS(parse_http_ldayname(&date, &len, tm)); /* Read the day name */
RET0_UNLESS(parse_expect_char(&date, &len, ',')); /* expect "," */
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
@@ -3145,7 +3150,6 @@
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
RET0_UNLESS(parse_strcmp(&date, &len, "GMT", 3)); /* GMT = %x47.4D.54 ; "GMT", case-sensitive */
tm->tm_isdst = -1;
- tm->tm_gmtoff = 0;
return 1;
}
@@ -3163,6 +3167,9 @@
*/
int parse_asctime_date(const char *date, int len, struct tm *tm)
{
+ /* tm_gmtoff, if present, ought to be zero'ed */
+ memset(tm, 0, sizeof(*tm));
+
RET0_UNLESS(parse_http_dayname(&date, &len, tm)); /* day-name */
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
RET0_UNLESS(parse_http_monthname(&date, &len, tm)); /* expect month */
@@ -3180,7 +3187,6 @@
RET0_UNLESS(parse_4digit(&date, &len, &tm->tm_year)); /* year = 4DIGIT */
tm->tm_year -= 1900;
tm->tm_isdst = -1;
- tm->tm_gmtoff = 0;
return 1;
}