From cd3461ed2decce6e980d3a4c93c615bd8f4cb5c0 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 22 Oct 2009 18:55:32 +0000 Subject: Fixed maddening mismatch between groff and strftime mismatch of day ("%e"). Noted by Ulrich Sporlein. --- out.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'out.c') diff --git a/out.c b/out.c index 73689b39..78abc5dc 100644 --- a/out.c +++ b/out.c @@ -1,4 +1,4 @@ -/* $Id: out.c,v 1.5 2009/10/18 19:02:10 kristaps Exp $ */ +/* $Id: out.c,v 1.6 2009/10/22 18:55:32 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -16,9 +16,11 @@ */ #include +#include #include #include #include +#include #include "out.h" @@ -117,3 +119,46 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def) return(1); } + + +/* + * Correctly writes the time in nroff form, which differs from standard + * form in that a space isn't printed in lieu of the extra %e field for + * single-digit dates. + */ +void +time2a(time_t t, char *dst, size_t sz) +{ + struct tm tm; + char buf[5]; + char *p; + size_t nsz; + + assert(sz > 1); + localtime_r(&t, &tm); + + p = dst; + nsz = 0; + + dst[0] = '\0'; + + if (0 == (nsz = strftime(p, sz, "%B ", &tm))) + return; + + p += (int)nsz; + sz -= nsz; + + if (0 == strftime(buf, sizeof(buf), "%e, ", &tm)) + return; + + nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz); + + if (nsz >= sz) + return; + + p += (int)nsz; + sz -= nsz; + + (void)strftime(p, sz, "%Y", &tm); +} + -- cgit v1.2.3