Merge ^/head r284188 through r284643.

1 files changed, 19 insertions, 0 deletions

diff --git a/contrib/file/src/localtime_r.c b/contrib/file/src/localtime_r.c
new file mode 100644
index 0000000..69d78d9
--- /dev/null
+++ b/contrib/file/src/localtime_r.c
@@ -0,0 +1,19 @@
+/*	$File: localtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $	*/
+
+#include "file.h"
+#ifndef	lint
+FILE_RCSID("@(#)$File: localtime_r.c,v 1.1 2015/01/09 19:28:32 christos Exp $")
+#endif	/* lint */
+#include <time.h>
+#include <string.h>
+
+/* asctime_r is not thread-safe anyway */
+struct tm *
+localtime_r(const time_t t, struct tm *tm)
+{
+	struct tm *tmp = localtime(t);
+	if (tmp == NULL)
+		return NULL;
+	memcpy(tm, tmp, sizeof(*tm));
+	return tmp;
+}