When timestamps are intented to be conversable back from string to binary it
is best to stick with UTC-0 timezone. This is needed in utmpdump(1).
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
include/timeutils.h | 3 ++-
lib/timeutils.c | 14 ++++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/include/timeutils.h b/include/timeutils.h
index 265577f..00d1820 100644
--- a/include/timeutils.h
+++ b/include/timeutils.h
@@ -61,7 +61,8 @@ enum {
ISO_8601_DOTUSEC = (1 << 3),
ISO_8601_COMMAUSEC = (1 << 4),
ISO_8601_TIMEZONE = (1 << 5),
- ISO_8601_SPACE = (1 << 6)
+ ISO_8601_SPACE = (1 << 6),
+ ISO_8601_GMTIME = (1 << 7)
};
#define ISO_8601_BUFSIZ 32
diff --git a/lib/timeutils.c b/lib/timeutils.c
index 25a163e..fd9aa3e 100644
--- a/lib/timeutils.c
+++ b/lib/timeutils.c
@@ -396,7 +396,12 @@ static int format_iso_time(struct tm *tm, suseconds_t usec, int flags, char *buf
/* timeval to ISO 8601 */
int strtimeval_iso(struct timeval *tv, int flags, char *buf, size_t bufsz)
{
- struct tm tm = *localtime(&tv->tv_sec);
+ struct tm tm;
+
+ if (flags & ISO_8601_GMTIME)
+ tm = *gmtime(&tv->tv_sec);
+ else
+ tm = *localtime(&tv->tv_sec);
return format_iso_time(&tm, tv->tv_usec, flags, buf, bufsz);
}
@@ -409,7 +414,12 @@ int strtm_iso(struct tm *tm, int flags, char *buf, size_t bufsz)
/* time_t to ISO 8601 */
int strtime_iso(const time_t *t, int flags, char *buf, size_t bufsz)
{
- struct tm tm = *localtime(t);
+ struct tm tm;
+
+ if (flags & ISO_8601_GMTIME)
+ tm = *gmtime(t);
+ else
+ tm = *localtime(t);
return format_iso_time(&tm, 0, flags, buf, bufsz);
}
--
2.9.0
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
