X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Ftime.c;h=d8e8fabf6442e3d83ac02364521c9a1abd54e98e;hp=762ffd0034fc3315c77e3951c0a41f5566fa2a3b;hb=299d8ae505f7c7262a8faa7564839322c26a1ffb;hpb=1b899f6e899047a521d473d00492bcf699f44ede

diff --git a/src/core/time.c b/src/core/time.c
index 762ffd0..d8e8fab 100644
--- a/src/core/time.c
+++ b/src/core/time.c
@@ -34,6 +34,7 @@
 
 #include <time.h>
 
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -41,7 +42,7 @@
  * public API
  */
 
-/* 1 second (in micro-seconds) */
+/* 1 second (in nano-seconds) */
 #define SEC 1000000000L
 
 const sdb_time_t SDB_INTERVAL_YEAR   = 3652425L   * 24L * 60L * 60L * 100000L;
@@ -77,18 +78,30 @@ sdb_sleep(sdb_time_t reg, sdb_time_t *rem)
 } /* sdb_sleep */
 
 size_t
-sdb_strftime(char *s, size_t len, const char *format, sdb_time_t t)
+sdb_strftime(char *s, size_t len, sdb_time_t t)
 {
+	char tmp[len];
 	time_t tstamp;
 	struct tm tm;
+	long tz;
 
 	memset(&tm, 0, sizeof(tm));
-
 	tstamp = (time_t)SDB_TIME_TO_SECS(t);
 	if (! localtime_r (&tstamp, &tm))
 		return 0;
 
-	return strftime(s, len, format, &tm);
+	if (! strftime(tmp, len, "%F %T", &tm))
+		return 0;
+	tmp[sizeof(tmp) - 1] = '\0';
+
+	tz = -timezone / 36;
+	if (tm.tm_isdst > 0)
+		tz += 100;
+
+	t %= SDB_INTERVAL_SECOND;
+	if (! t)
+		return snprintf(s, len, "%s %+05ld", tmp, tz);
+	return snprintf(s, len, "%s.%09ld %+05ld", tmp, t, tz);
 } /* sdb_strftime */
 
 size_t
@@ -98,7 +111,7 @@ sdb_strfinterval(char *s, size_t len, sdb_time_t interval)
 	size_t i;
 
 	/* special case the optional fractional part for seconds */
-	_Bool have_seconds = 0;
+	bool have_seconds = 0;
 
 	struct {
 		sdb_time_t  interval;
@@ -147,5 +160,31 @@ sdb_strfinterval(char *s, size_t len, sdb_time_t interval)
 	return n;
 } /* sdb_strfinterval */
 
+sdb_time_t
+sdb_strpunit(const char *s)
+{
+	struct {
+		const char *s;
+		sdb_time_t unit;
+	} units[] = {
+		{ "Y", SDB_INTERVAL_YEAR },
+		{ "M", SDB_INTERVAL_MONTH },
+		{ "D", SDB_INTERVAL_DAY },
+		{ "h", SDB_INTERVAL_HOUR },
+		{ "m", SDB_INTERVAL_MINUTE },
+		{ "s", SDB_INTERVAL_SECOND },
+		{ "ms", SDB_INTERVAL_SECOND / 1000L },
+		{ "us", SDB_INTERVAL_SECOND / 1000000L },
+		{ "ns", 1 },
+	};
+
+	size_t i;
+
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(units); ++i)
+		if (! strcmp(s, units[i].s))
+			return units[i].unit;
+	return 0;
+} /* sdb_strpunit */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */