From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from scc-mailout-kit-01-web.scc.kit.edu (scc-mailout-kit-01-web.scc.kit.edu [129.13.231.93]) by fantadrom.bsd.lv (OpenSMTPD) with ESMTP id f1c91ca9 for ; Thu, 12 Nov 2015 18:06:23 -0500 (EST) Received: from asta-nat.asta.uni-karlsruhe.de ([172.22.63.82] helo=hekate.usta.de) by scc-mailout-kit-01.scc.kit.edu with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (envelope-from ) id 1Zx0we-0006NY-6F; Fri, 13 Nov 2015 00:06:21 +0100 Received: from donnerwolke.usta.de ([172.24.96.3]) by hekate.usta.de with esmtp (Exim 4.77) (envelope-from ) id 1Zx0we-0004PA-4I; Fri, 13 Nov 2015 00:06:20 +0100 Received: from athene.usta.de ([172.24.96.10]) by donnerwolke.usta.de with esmtp (Exim 4.84) (envelope-from ) id 1Zx0wd-0007cK-VK; Fri, 13 Nov 2015 00:06:20 +0100 Received: from localhost (1031@localhost [local]); by localhost (OpenSMTPD) with ESMTPA id b2866c8f; Fri, 13 Nov 2015 00:06:19 +0100 (CET) Date: Fri, 13 Nov 2015 00:06:19 +0100 From: Ingo Schwarze To: Dag-Erling Smoergrav Cc: discuss@mdocml.bsd.lv Subject: Re: Mdocdate Message-ID: <20151112230619.GN20023@athene.usta.de> References: <86r3jva7s9.fsf@desk.des.no> <20151112213135.GL20023@athene.usta.de> X-Mailinglist: mdocml-discuss Reply-To: discuss@mdocml.bsd.lv MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151112213135.GL20023@athene.usta.de> User-Agent: Mutt/1.5.23 (2014-03-12) Hi Dag-Erling, Ingo Schwarze wrote on Thu, Nov 12, 2015 at 10:31:35PM +0100: > Dag-Erling Smoergrav wrote on Thu, Nov 12, 2015 at 10:25:42AM +0100: >> - in time2a(): >> >> Use a sufficiently large stack buffer and mandoc_strdup() instead of >> trying to guess at the correct length. > This does look useful, it simplifies the code. Unfortunately, testing revealed that it breaks the output. I have added a comment explaining why the seemingly weird formatting code is required, such that people don't write the same patch again. However, i did simplify the code in mandoc_normdate() the way you suggested and added some comments there, too. It is much more readable now, thanks for the idea. Yours, Ingo Log Message: ----------- Simplify the logic in mandoc_normdate() and add some comments. Also add a comment in time2a() explaining why it isn't possible to use just one single call to strftime(). Do some style cleanup while here. No functional change. Triggered by a very different patch from des@FreeBSD. Modified Files: -------------- mdocml: mandoc.c Revision Data ------------- Index: mandoc.c =================================================================== RCS file: /home/cvs/mdocml/mdocml/mandoc.c,v retrieving revision 1.97 retrieving revision 1.98 diff -Lmandoc.c -Lmandoc.c -u -p -r1.97 -r1.98 --- mandoc.c +++ mandoc.c @@ -478,17 +478,27 @@ time2a(time_t t) * up to 2 characters for the day + comma + blank * 4 characters for the year and a terminating '\0' */ + p = buf = mandoc_malloc(10 + 4 + 4 + 1); - if (0 == (ssz = strftime(p, 10 + 1, "%B ", tm))) + if ((ssz = strftime(p, 10 + 1, "%B ", tm)) == 0) goto fail; p += (int)ssz; - if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday))) + /* + * The output format is just "%d" here, not "%2d" or "%02d". + * That's also the reason why we can't just format the + * date as a whole with "%B %e, %Y" or "%B %d, %Y". + * Besides, the present approach is less prone to buffer + * overflows, in case anybody should ever introduce the bug + * of looking at LC_TIME. + */ + + if ((isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)) == -1) goto fail; p += isz; - if (0 == strftime(p, 4 + 1, "%Y", tm)) + if (strftime(p, 4 + 1, "%Y", tm) == 0) goto fail; return buf; @@ -500,23 +510,29 @@ fail: char * mandoc_normdate(struct mparse *parse, char *in, int ln, int pos) { - char *out; time_t t; - if (NULL == in || '\0' == *in || - 0 == strcmp(in, "$" "Mdocdate$")) { + /* No date specified: use today's date. */ + + if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) { mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL); - time(&t); + return time2a(time(NULL)); } - else if (a2time(&t, "%Y-%m-%d", in)) - t = 0; - else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) && - !a2time(&t, "%b %d, %Y", in)) { + + /* Valid mdoc(7) date format. */ + + if (a2time(&t, "$" "Mdocdate: %b %d %Y $", in) || + a2time(&t, "%b %d, %Y", in)) + return time2a(t); + + /* Do not warn about the legacy man(7) format. */ + + if ( ! a2time(&t, "%Y-%m-%d", in)) mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in); - t = 0; - } - out = t ? time2a(t) : NULL; - return out ? out : mandoc_strdup(in); + + /* Use any non-mdoc(7) date verbatim. */ + + return mandoc_strdup(in); } int -- To unsubscribe send an email to discuss+unsubscribe@mdocml.bsd.lv