From 5c400e2a8f2277ebc7212422540a7b3085b7ef9d Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Tue, 25 Aug 2020 13:21:17 +0200
Subject: fix(timeutil): let flocaltime return actual len

Behavior now more consistent what you'd expect from strftime
---
 timeutil.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/timeutil.c b/timeutil.c
index 37c8eec..187ace0 100644
--- a/timeutil.c
+++ b/timeutil.c
@@ -31,6 +31,12 @@ size_t flocaltime(char *b, enum time_format type, size_t size, const time_t *tim
 
     size_t res = strftime(b, size, format, local);
 
+    if(res == 0) {
+        return 0;
+    }
+
+    size_t offset_len = 0;
+
     if(type == ATOM_TIME_FORMAT || type == HTML_TIME_FORMAT_READABLE) {
         // for these formats we need to append a RFC3339 UTC offset
         // unfortunately it is *not* exactly provided by strftime,
@@ -43,6 +49,8 @@ size_t flocaltime(char *b, enum time_format type, size_t size, const time_t *tim
         if(timezone == 0 && !local->tm_isdst) {
             offset[0] = 'Z';
             offset[1] = '\0';
+
+            offset_len = 1;
         } else {
             // for some reason timezone is seconds *west* of UTC which
             // is inverse to how UTC offsets are denoted
@@ -73,6 +81,8 @@ size_t flocaltime(char *b, enum time_format type, size_t size, const time_t *tim
             offset[4] = nibble_hex((short) minute / 10);
             offset[5] = nibble_hex((short) minute % 10);
             offset[6] = '\0';
+
+            offset_len = 6;
         }
 
         if(res > 0 && res + offset_size <= size) {
@@ -83,5 +93,5 @@ size_t flocaltime(char *b, enum time_format type, size_t size, const time_t *tim
     // prevent any buffer overflows
     b[size - 1] = '\0';
 
-    return res;
+    return res + offset_len;
 }
-- 
cgit 1.4.1