From: "Pádraig Brady" <P@draigBrady.com>
To: Karel Zak <kzak@redhat.com>, util-linux@vger.kernel.org
Subject: Re: cal(1) year formatting
Date: Wed, 18 May 2016 14:05:21 +0100 [thread overview]
Message-ID: <573C6891.1070009@draigBrady.com> (raw)
In-Reply-To: <20160518125100.gqvcbbfx23tti6re@ws.net.home>
On 18/05/16 13:51, Karel Zak wrote:
>
> See the patch below. I have no strong opinion about it, any
> objection?
>
> Karel
>
>
>>From e671a62ef8574b16cd6acbfd04dc35c514b184e5 Mon Sep 17 00:00:00 2001
> From: Karel Zak <kzak@redhat.com>
> Date: Wed, 18 May 2016 14:43:20 +0200
> Subject: [PATCH] cal: use %04d for year
>
> It seems that people are crazy enough to assume that "cal 16" is the
> year 2016, rather than 16 (2000 years ago).
>
> This patch makes it more clear as the output is 0016.
>
> Addresses: https://github.com/karelzak/util-linux/issues/320
> Signed-off-by: Karel Zak <kzak@redhat.com>
> ---
> misc-utils/cal.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/misc-utils/cal.c b/misc-utils/cal.c
> index 2a53b89..3e20530 100644
> --- a/misc-utils/cal.c
> +++ b/misc-utils/cal.c
> @@ -516,7 +516,7 @@ static void headers_init(struct cal_control *ctl)
> char tmp[FMT_ST_CHARS];
> int year_len;
>
> - year_len = snprintf(tmp, sizeof(tmp), "%d", ctl->req.year);
> + year_len = snprintf(tmp, sizeof(tmp), "%04d", ctl->req.year);
>
> if (year_len < 0 || (size_t)year_len >= sizeof(tmp)) {
> /* XXX impossible error */
> @@ -612,13 +612,13 @@ static void cal_output_header(struct cal_month *month, const struct cal_control
> if (!ctl->header_year) {
> my_putstring("\n");
> for (i = month; i; i = i->next) {
> - sprintf(out, _("%d"), i->year);
> + sprintf(out, _("%04d"), i->year);
> center(out, ctl->week_width - 1, i->next == NULL ? 0 : ctl->gutter_width);
> }
> }
> } else {
> for (i = month; i; i = i->next) {
> - sprintf(out, _("%s %d"), ctl->full_month[i->month - 1], i->year);
> + sprintf(out, _("%s %04d"), ctl->full_month[i->month - 1], i->year);
> center(out, ctl->week_width - 1, i->next == NULL ? 0 : ctl->gutter_width);
> }
> }
> @@ -762,7 +762,7 @@ static void yearly(const struct cal_control *ctl)
> year_width--;
>
> if (ctl->header_year) {
> - sprintf(out, "%d", ctl->req.year);
> + sprintf(out, "%04d", ctl->req.year);
> center(out, year_width, 0);
> my_putstring("\n\n");
> }
>
more upsides than downsides so +1 from me
next prev parent reply other threads:[~2016-05-18 13:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 12:51 cal(1) year formatting Karel Zak
2016-05-18 13:05 ` Pádraig Brady [this message]
2016-05-18 20:09 ` Sami Kerola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=573C6891.1070009@draigBrady.com \
--to=p@draigbrady.com \
--cc=kzak@redhat.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox