X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Ftime.c;h=d8e8fabf6442e3d83ac02364521c9a1abd54e98e;hp=5d34e18b4fed99a8769ed9f17d226e6d9432db5d;hb=ed2c9fc3e4ca6840a5a31c735f0cfc02fd21d4fc;hpb=e460978379cc477e806251ba38cb426b2aa9fddf

diff --git a/src/core/time.c b/src/core/time.c
index 5d34e18..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>
 
@@ -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;