ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libcommon: add ISO_8601_GMTIME that will print UTC-0 timestamps 

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@iki.fi>
This commit is contained in:
Sami Kerola 2016-06-19 21:43:40 +01:00
parent 3749bdcecf
commit c161694682
No known key found for this signature in database
GPG Key ID: A9553245FDE9B739
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/timeutils.h
View File

@ -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

14
lib/timeutils.c
View File

@ -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);
}