Merge tag '1.2' into since

Version 1.2

1 files changed, 61 insertions, 0 deletions

diff --git a/localtime.c b/localtime.c
new file mode 100644
index 0000000..0b075a0
--- /dev/null
+++ b/localtime.c
@@ -0,0 +1,61 @@
+/* See LICENSE file for copyright and license details. */
+#include "libsimple.h"
+#include <sys/timex.h>
+#ifndef TEST
+
+
+int
+libsimple_localtime(struct tm *tm, struct timespec *ts)
+{
+	struct timex timex;
+	int r;
+
+	memset(&timex, 0, sizeof(timex));
+	timex.status = ADJ_NANO;
+	r = adjtimex(&timex);
+	if (r == -1)
+		return -1;
+	if (ts) {
+		ts->tv_sec = timex.time.tv_sec;
+		ts->tv_nsec = timex.time.tv_usec;
+	}
+
+	if (timex.time.tv_sec % (24 * 60 * 60) == 0) {
+		if (r == TIME_INS) {
+			timex.time.tv_sec -= 1;
+			if (!localtime_r(&timex.time.tv_sec, tm))
+				return -1;
+			tm->tm_sec += 1;
+			return 1;
+		} else if (r == TIME_DEL) {
+			timex.time.tv_sec += 1;
+			if (!localtime_r(&timex.time.tv_sec, tm))
+				return -1;
+		} else {
+			if (!localtime_r(&timex.time.tv_sec, tm))
+				return -1;
+		}
+	} else if (r == TIME_OOP) {
+		if (!localtime_r(&timex.time.tv_sec, tm))
+			return -1;
+		tm->tm_sec += 1;
+	} else {
+		if (!localtime_r(&timex.time.tv_sec, tm))
+			return -1;
+	}
+
+	return 0;
+}
+
+
+#else
+#include "test.h"
+
+int
+main(void)
+{
+	/* TODO test */
+	return 0;
+}
+
+#endif