X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Ftime.c;h=d8e8fabf6442e3d83ac02364521c9a1abd54e98e;hp=3baf2240cb30b5197d02e601275617d6f67c6bd2;hb=b75718ea9fe4d6c90f1794e517a0712729553c0c;hpb=fa5c130fbd0c75f3c47f1b28feb8d76a4791a93e

diff --git a/src/core/time.c b/src/core/time.c
index 3baf224..d8e8fab 100644
--- a/src/core/time.c
+++ b/src/core/time.c
@@ -25,16 +25,33 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include "sysdb.h"
 #include "core/time.h"
 
 #include <time.h>
 
+#include <stdbool.h>
+#include <stdio.h>
 #include <string.h>
 
 /*
  * public API
  */
 
+/* 1 second (in nano-seconds) */
+#define SEC 1000000000L
+
+const sdb_time_t SDB_INTERVAL_YEAR   = 3652425L   * 24L * 60L * 60L * 100000L;
+const sdb_time_t SDB_INTERVAL_MONTH  =  30436875L * 24L * 60L * 60L * 1000L;
+const sdb_time_t SDB_INTERVAL_DAY    =              24L * 60L * 60L * SEC;
+const sdb_time_t SDB_INTERVAL_HOUR   =                    60L * 60L * SEC;
+const sdb_time_t SDB_INTERVAL_MINUTE =                          60L * SEC;
+const sdb_time_t SDB_INTERVAL_SECOND =                                SEC;
+
 sdb_time_t
 sdb_gettime(void)
 {
@@ -61,19 +78,113 @@ 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
+sdb_strfinterval(char *s, size_t len, sdb_time_t interval)
+{
+	size_t n = 0;
+	size_t i;
+
+	/* special case the optional fractional part for seconds */
+	bool have_seconds = 0;
+
+	struct {
+		sdb_time_t  interval;
+		const char *suffix;
+	} specs[] = {
+		{ SDB_INTERVAL_YEAR,   "Y" },
+		{ SDB_INTERVAL_MONTH,  "M" },
+		{ SDB_INTERVAL_DAY,    "D" },
+		{ SDB_INTERVAL_HOUR,   "h" },
+		{ SDB_INTERVAL_MINUTE, "m" },
+		{ SDB_INTERVAL_SECOND, "" },
+	};
+
+#define LEN (len > n ? len - n : 0)
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(specs); ++i) {
+		if (interval >= specs[i].interval) {
+			n += snprintf(s + n, LEN, "%"PRIsdbTIME"%s",
+					interval / specs[i].interval, specs[i].suffix);
+			interval %= specs[i].interval;
+			if (specs[i].interval == SDB_INTERVAL_SECOND)
+				have_seconds = 1;
+		}
+	}
+
+	if (interval) {
+		n += snprintf(s + n, LEN, ".%09"PRIsdbTIME, interval);
+		have_seconds = 1;
+
+		/* removing trailing zeroes */
+		if (n <= len)
+			while (s[n - 1] == '0')
+				s[n--] = '\0';
+	}
+
+	if (! n) {
+		n = snprintf(s, len, "0");
+		have_seconds = 1;
+	}
+
+	if (have_seconds)
+		n += snprintf(s + n, LEN, "s");
+#undef LEN
+
+	if (len)
+		s[len - 1] = '\0';
+	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 : */