Various

Use new NumericConverter, StrToInt32 and StrToUint32 functions in
RRFLibraries
Added DueXn i2C transaction counter
Replaced strptime by SafeStrptime

2 files changed, 249 insertions, 548 deletions

diff --git a/src/libc/strptime.c b/src/libc/strptime.c
deleted file mode 100644
index 64afd63b..00000000
--- a/src/libc/strptime.c
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Copyright (c) 1999 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- *
- * 3. Neither the name of KTH nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-/*
- * DC 2020/01/10: added conditionals to disable those format specifiers that need a locale and other that we don't need,
- *  such as GNU-specific format specifiers, AM/PM specifiers, 12-hour clock specifiers, 2-digit year specifiers, and month and day number specifiers.
- * The only format specifiers currently used by RepRapFirmware are: YmdHMS
- */
-
-#define _GNU_SOURCE
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#if 0	// DC
-#include "../locale/setlocale.h"
-
-#define _ctloc(x) (_CurrentTimeLocale->x)
-#endif
-
-static const int _DAYS_BEFORE_MONTH[12] =
-{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-
-#define SET_MDAY 1
-#define SET_MON  2
-#define SET_YEAR 4
-#define SET_WDAY 8
-#define SET_YDAY 16
-#define SET_YMD  (SET_YEAR | SET_MON | SET_MDAY)
-
-/*
- * tm_year is relative this year 
- */
-const int tm_year_base = 1900;
-
-/*
- * Return TRUE iff `year' was a leap year.
- * Needed for strptime.
- */
-static int
-is_leap_year (int year)
-{
-    return (year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0);
-}
-
-#if 0	// DC
-/* Needed for strptime. */
-static int
-match_string (const char *__restrict *buf, const char * const*strs,
-	      locale_t locale)
-{
-    int i = 0;
-
-    for (i = 0; strs[i] != NULL; ++i) {
-	int len = strlen (strs[i]);
-
-	if (strncasecmp_l (*buf, strs[i], len, locale) == 0) {
-	    *buf += len;
-	    return i;
-	}
-    }
-    return -1;
-}
-#endif
-
-/* Needed for strptime. */
-static int
-first_day (int year)
-{
-    int ret = 4;
-
-    while (--year >= 1970)
-	ret = (ret + 365 + is_leap_year (year)) % 7;
-    return ret;
-}
-
-/*
- * Set `timeptr' given `wnum' (week number [0, 53])
- * Needed for strptime
- */
-
-#if 0	// DC
-static void
-set_week_number_sun (struct tm *timeptr, int wnum)
-{
-    int fday = first_day (timeptr->tm_year + tm_year_base);
-
-    timeptr->tm_yday = wnum * 7 + timeptr->tm_wday - fday;
-    if (timeptr->tm_yday < 0) {
-	timeptr->tm_wday = fday;
-	timeptr->tm_yday = 0;
-    }
-}
-
-/*
- * Set `timeptr' given `wnum' (week number [0, 53])
- * Needed for strptime
- */
-
-static void
-set_week_number_mon (struct tm *timeptr, int wnum)
-{
-    int fday = (first_day (timeptr->tm_year + tm_year_base) + 6) % 7;
-
-    timeptr->tm_yday = wnum * 7 + (timeptr->tm_wday + 6) % 7 - fday;
-    if (timeptr->tm_yday < 0) {
-	timeptr->tm_wday = (fday + 1) % 7;
-	timeptr->tm_yday = 0;
-    }
-}
-
-/*
- * Set `timeptr' given `wnum' (week number [0, 53])
- * Needed for strptime
- */
-static void
-set_week_number_mon4 (struct tm *timeptr, int wnum)
-{
-    int fday = (first_day (timeptr->tm_year + tm_year_base) + 6) % 7;
-    int offset = 0;
-
-    if (fday < 4)
-	offset += 7;
-
-    timeptr->tm_yday = offset + (wnum - 1) * 7 + timeptr->tm_wday - fday;
-    if (timeptr->tm_yday < 0) {
-	timeptr->tm_wday = fday;
-	timeptr->tm_yday = 0;
-    }
-}
-#endif
-
-#if 1	//DC
-
-#undef 	isspace_l
-#define isspace_l(_c, _l)			isspace(_c)
-#define strtol_l(_b, _s, _n, _l)	strtol(_b, _s, _n)
-#define strptime_l(_b, _f, _t, _l)	strptime_dc(_b, _f, _t)
-
-char *strptime_dc (const char *buf, const char *format, struct tm *timeptr)
-#else
-char *
-strptime_l (const char *buf, const char *format, struct tm *timeptr,
-	    locale_t locale)
-#endif
-{
-    char c;
-    int ymd = 0;
-
-#if 0	// DC
-    const struct lc_time_T *_CurrentTimeLocale = __get_time_locale (locale);
-#endif
-    for (; (c = *format) != '\0'; ++format) {
-	char *s;
-	int ret;
-
-	if (isspace_l ((unsigned char) c, locale)) {
-	    while (isspace_l ((unsigned char) *buf, locale))
-		++buf;
-	} else if (c == '%' && format[1] != '\0') {
-	    c = *++format;
-	    if (c == 'E' || c == 'O')
-		c = *++format;
-	    switch (c) {
-#if 0	// DC
-	    case 'A' :
-		ret = match_string (&buf, _ctloc (weekday), locale);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_wday = ret;
-		ymd |= SET_WDAY;
-		break;
-	    case 'a' :
-		ret = match_string (&buf, _ctloc (wday), locale);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_wday = ret;
-		ymd |= SET_WDAY;
-		break;
-	    case 'B' :
-		ret = match_string (&buf, _ctloc (month), locale);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_mon = ret;
-		ymd |= SET_MON;
-		break;
-	    case 'b' :
-	    case 'h' :
-		ret = match_string (&buf, _ctloc (mon), locale);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_mon = ret;
-		ymd |= SET_MON;
-		break;
-	    case 'C' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_year = (ret * 100) - tm_year_base;
-		buf = s;
-		ymd |= SET_YEAR;
-		break;
-	    case 'c' :		/* %a %b %e %H:%M:%S %Y */
-		s = strptime_l (buf, _ctloc (c_fmt), timeptr, locale);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		ymd |= SET_WDAY | SET_YMD;
-		break;
-	    case 'D' :		/* %m/%d/%y */
-		s = strptime_l (buf, "%m/%d/%y", timeptr, locale);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		ymd |= SET_YMD;
-		break;
-#endif
-	    case 'd' :
-	    case 'e' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_mday = ret;
-		buf = s;
-		ymd |= SET_MDAY;
-		break;
-#if 0	// DC
-	    case 'F' :		/* %Y-%m-%d - GNU extension */
-		s = strptime_l (buf, "%Y-%m-%d", timeptr, locale);
-		if (s == NULL || s == buf)
-		    return NULL;
-		buf = s;
-		ymd |= SET_YMD;
-		break;
-#endif
-	    case 'H' :
-	    case 'k' :		/* hour with leading space - GNU extension */
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_hour = ret;
-		buf = s;
-		break;
-#if 0	// DC
-	    case 'I' :
-	    case 'l' :		/* hour with leading space - GNU extension */
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		if (ret == 12)
-		    timeptr->tm_hour = 0;
-		else
-		    timeptr->tm_hour = ret;
-		buf = s;
-		break;
-	    case 'j' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_yday = ret - 1;
-		buf = s;
-		ymd |= SET_YDAY;
-		break;
-#endif
-	    case 'm' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_mon = ret - 1;
-		buf = s;
-		ymd |= SET_MON;
-		break;
-	    case 'M' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_min = ret;
-		buf = s;
-		break;
-	    case 'n' :
-		if (*buf == '\n')
-		    ++buf;
-		else
-		    return NULL;
-		break;
-#if 0	//DC
-	    case 'p' :
-		ret = match_string (&buf, _ctloc (am_pm), locale);
-		if (ret < 0)
-		    return NULL;
-		if (timeptr->tm_hour == 0) {
-		    if (ret == 1)
-			timeptr->tm_hour = 12;
-		} else
-		    timeptr->tm_hour += 12;
-		break;
-	    case 'r' :		/* %I:%M:%S %p */
-		s = strptime_l (buf, _ctloc (ampm_fmt), timeptr, locale);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'R' :		/* %H:%M */
-		s = strptime_l (buf, "%H:%M", timeptr, locale);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 's' :		/* seconds since Unix epoch - GNU extension */
-		{
-		    long long sec;
-		    time_t t;
-		    int save_errno;
-
-		    save_errno = errno;
-		    errno = 0;
-		    sec = strtoll_l (buf, &s, 10, locale);
-		    t = sec;
-		    if (s == buf
-			|| errno != 0
-			|| t != sec
-			|| localtime_r (&t, timeptr) != timeptr)
-			return NULL;
-		    errno = save_errno;
-		    buf = s;
-		    ymd |= SET_YDAY | SET_WDAY | SET_YMD;
-		    break;
-		}
-#endif
-	    case 'S' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_sec = ret;
-		buf = s;
-		break;
-#if 0	// DC
-	    case 't' :
-		if (*buf == '\t')
-		    ++buf;
-		else
-		    return NULL;
-		break;
-	    case 'T' :		/* %H:%M:%S */
-		s = strptime_l (buf, "%H:%M:%S", timeptr, locale);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'u' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_wday = ret - 1;
-		buf = s;
-		ymd |= SET_WDAY;
-		break;
-	    case 'w' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_wday = ret;
-		buf = s;
-		ymd |= SET_WDAY;
-		break;
-	    case 'U' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		set_week_number_sun (timeptr, ret);
-		buf = s;
-		ymd |= SET_YDAY;
-		break;
-	    case 'V' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		set_week_number_mon4 (timeptr, ret);
-		buf = s;
-		ymd |= SET_YDAY;
-		break;
-	    case 'W' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		set_week_number_mon (timeptr, ret);
-		buf = s;
-		ymd |= SET_YDAY;
-		break;
-	    case 'x' :
-		s = strptime_l (buf, _ctloc (x_fmt), timeptr, locale);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		ymd |= SET_YMD;
-		break;
-	    case 'X' :
-		s = strptime_l (buf, _ctloc (X_fmt), timeptr, locale);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-	    	break;
-	    case 'y' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		if (ret < 70)
-		    timeptr->tm_year = 100 + ret;
-		else
-		    timeptr->tm_year = ret;
-		buf = s;
-		ymd |= SET_YEAR;
-		break;
-#endif
-	    case 'Y' :
-		ret = strtol_l (buf, &s, 10, locale);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_year = ret - tm_year_base;
-		buf = s;
-		ymd |= SET_YEAR;
-		break;
-	    case 'Z' :
-		/* Unsupported. Just ignore.  */
-		break;
-	    case '\0' :
-		--format;
-		/* FALLTHROUGH */
-		/* no break - DC added for Eclipse */
-	    case '%' :
-		if (*buf == '%')
-		    ++buf;
-		else
-		    return NULL;
-		break;
-	    default :
-		if (*buf == '%' || *++buf == c)
-		    ++buf;
-		else
-		    return NULL;
-		break;
-	    }
-	} else {
-	    if (*buf == c)
-		++buf;
-	    else
-		return NULL;
-	}
-    }
-
-    if ((ymd & SET_YMD) == SET_YMD) {
-	/* all of tm_year, tm_mon and tm_mday, but... */
-
-	if (!(ymd & SET_YDAY)) {
-	    /* ...not tm_yday, so fill it in */
-	    timeptr->tm_yday = _DAYS_BEFORE_MONTH[timeptr->tm_mon]
-		+ timeptr->tm_mday;
-	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-		|| timeptr->tm_mon < 2)
-	    {
-		timeptr->tm_yday--;
-	    }
-	    ymd |= SET_YDAY;
-	}
-    }
-    else if ((ymd & (SET_YEAR | SET_YDAY)) == (SET_YEAR | SET_YDAY)) {
-	/* both of tm_year and tm_yday, but... */
-
-	if (!(ymd & SET_MON)) {
-	    /* ...not tm_mon, so fill it in, and/or... */
-	    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[1])
-		timeptr->tm_mon = 0;
-	    else {
-		int leap = is_leap_year (timeptr->tm_year + tm_year_base);
-		int i;
-		for (i = 2; i < 12; ++i) {
-		    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[i] + leap)
-			break;
-		}
-		timeptr->tm_mon = i - 1;
-	    }
-	}
-
-	if (!(ymd & SET_MDAY)) {
-	    /* ...not tm_mday, so fill it in */
-	    timeptr->tm_mday = timeptr->tm_yday
-		- _DAYS_BEFORE_MONTH[timeptr->tm_mon];
-	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
-		|| timeptr->tm_mon < 2)
-	    {
-		timeptr->tm_mday++;
-	    }
-	}
-    }
-
-    if ((ymd & (SET_YEAR | SET_YDAY | SET_WDAY)) == (SET_YEAR | SET_YDAY)) {
-	/* fill in tm_wday */
-	int fday = first_day (timeptr->tm_year + tm_year_base);
-	timeptr->tm_wday = (fday + timeptr->tm_yday) % 7;
-    }
-
-    return (char *)buf;
-}
-
-char *
-strptime (const char *buf, const char *format, struct tm *timeptr)
-{
-#if 1	// DC
-	return strptime_dc (buf, format, timeptr);
-#else
-  return strptime_l (buf, format, timeptr, __get_current_locale ());
-#endif
-}
diff --git a/src/libc/strptime.cpp b/src/libc/strptime.cpp
new file mode 100644
index 00000000..70835714
--- /dev/null
+++ b/src/libc/strptime.cpp
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 1999 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of KTH nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+/*
+ * DC 2020/01/10: removged code for those format specifiers that need a locale and others that we don't need,
+ *  such as GNU-specific format specifiers, AM/PM specifiers, 12-hour clock specifiers, 2-digit year specifiers, and month and day number specifiers.
+ * The only format specifiers currently used by RepRapFirmware are: YmdHMS
+ */
+
+#define _GNU_SOURCE
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include <strings.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+
+#include <General/SafeStrtod.h>
+
+static constexpr int _DAYS_BEFORE_MONTH[12] =
+{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
+
+#define SET_MDAY 1
+#define SET_MON  2
+#define SET_YEAR 4
+#define SET_WDAY 8
+#define SET_YDAY 16
+#define SET_YMD  (SET_YEAR | SET_MON | SET_MDAY)
+
+/*
+ * tm_year is relative this year
+ */
+constexpr int tm_year_base = 1900;
+
+/*
+ * Return TRUE iff `year' was a leap year.
+ * Needed for strptime.
+ */
+static int is_leap_year (int year) noexcept
+{
+    return (year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0);
+}
+
+/* Needed for strptime. */
+static int first_day (int year) noexcept
+{
+    int ret = 4;
+
+    while (--year >= 1970)
+	ret = (ret + 365 + is_leap_year (year)) % 7;
+    return ret;
+}
+
+#undef 	isspace_l
+#define isspace_l(_c, _l)			isspace(_c)
+#define strtol_l(_b, _s, _n, _l)	StrToI32(_b, _s)
+#define strptime_l(_b, _f, _t, _l)	strptime_dc(_b, _f, _t)
+
+const char *SafeStrptime(const char *buf, const char *format, struct tm *timeptr) noexcept
+{
+    char c;
+    int ymd = 0;
+
+    for (; (c = *format) != '\0'; ++format) {
+    const char *s;
+	int ret;
+
+	if (isspace_l ((unsigned char) c, locale)) {
+	    while (isspace_l ((unsigned char) *buf, locale))
+		++buf;
+	} else if (c == '%' && format[1] != '\0') {
+	    c = *++format;
+	    if (c == 'E' || c == 'O')
+		c = *++format;
+	    switch (c) {
+	    case 'd' :
+	    case 'e' :
+		ret = strtol_l (buf, &s, 10, locale);
+		if (s == buf)
+		    return NULL;
+		timeptr->tm_mday = ret;
+		buf = s;
+		ymd |= SET_MDAY;
+		break;
+	    case 'H' :
+	    case 'k' :		/* hour with leading space - GNU extension */
+		ret = strtol_l (buf, &s, 10, locale);
+		if (s == buf)
+		    return NULL;
+		timeptr->tm_hour = ret;
+		buf = s;
+		break;
+	    case 'm' :
+		ret = strtol_l (buf, &s, 10, locale);
+		if (s == buf)
+		    return NULL;
+		timeptr->tm_mon = ret - 1;
+		buf = s;
+		ymd |= SET_MON;
+		break;
+	    case 'M' :
+		ret = strtol_l (buf, &s, 10, locale);
+		if (s == buf)
+		    return NULL;
+		timeptr->tm_min = ret;
+		buf = s;
+		break;
+	    case 'n' :
+		if (*buf == '\n')
+		    ++buf;
+		else
+		    return NULL;
+		break;
+	    case 'S' :
+		ret = strtol_l (buf, &s, 10, locale);
+		if (s == buf)
+		    return NULL;
+		timeptr->tm_sec = ret;
+		buf = s;
+		break;
+	    case 'Y' :
+		ret = strtol_l (buf, &s, 10, locale);
+		if (s == buf)
+		    return NULL;
+		timeptr->tm_year = ret - tm_year_base;
+		buf = s;
+		ymd |= SET_YEAR;
+		break;
+	    case 'Z' :
+		/* Unsupported. Just ignore.  */
+		break;
+	    case '\0' :
+		--format;
+		/* FALLTHROUGH */
+		/* no break - DC added for Eclipse */
+	    case '%' :
+		if (*buf == '%')
+		    ++buf;
+		else
+		    return NULL;
+		break;
+	    default :
+		if (*buf == '%' || *++buf == c)
+		    ++buf;
+		else
+		    return NULL;
+		break;
+	    }
+	} else {
+	    if (*buf == c)
+		++buf;
+	    else
+		return NULL;
+	}
+    }
+
+    if ((ymd & SET_YMD) == SET_YMD) {
+	/* all of tm_year, tm_mon and tm_mday, but... */
+
+	if (!(ymd & SET_YDAY)) {
+	    /* ...not tm_yday, so fill it in */
+	    timeptr->tm_yday = _DAYS_BEFORE_MONTH[timeptr->tm_mon]
+		+ timeptr->tm_mday;
+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
+		|| timeptr->tm_mon < 2)
+	    {
+		timeptr->tm_yday--;
+	    }
+	    ymd |= SET_YDAY;
+	}
+    }
+    else if ((ymd & (SET_YEAR | SET_YDAY)) == (SET_YEAR | SET_YDAY)) {
+	/* both of tm_year and tm_yday, but... */
+
+	if (!(ymd & SET_MON)) {
+	    /* ...not tm_mon, so fill it in, and/or... */
+	    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[1])
+		timeptr->tm_mon = 0;
+	    else {
+		int leap = is_leap_year (timeptr->tm_year + tm_year_base);
+		int i;
+		for (i = 2; i < 12; ++i) {
+		    if (timeptr->tm_yday < _DAYS_BEFORE_MONTH[i] + leap)
+			break;
+		}
+		timeptr->tm_mon = i - 1;
+	    }
+	}
+
+	if (!(ymd & SET_MDAY)) {
+	    /* ...not tm_mday, so fill it in */
+	    timeptr->tm_mday = timeptr->tm_yday
+		- _DAYS_BEFORE_MONTH[timeptr->tm_mon];
+	    if (!is_leap_year (timeptr->tm_year + tm_year_base)
+		|| timeptr->tm_mon < 2)
+	    {
+		timeptr->tm_mday++;
+	    }
+	}
+    }
+
+    if ((ymd & (SET_YEAR | SET_YDAY | SET_WDAY)) == (SET_YEAR | SET_YDAY)) {
+	/* fill in tm_wday */
+	int fday = first_day (timeptr->tm_year + tm_year_base);
+	timeptr->tm_wday = (fday + timeptr->tm_yday) % 7;
+    }
+
+    return buf;
+}
+
+extern "C" char * strptime (const char *buf, const char *format, struct tm *timeptr) noexcept
+{
+	return const_cast<char *>(SafeStrptime (buf, format, timeptr));
+}
+
+// End