Re: [PATCH] util-linux-2.15/cal: cal date highlight enhancement

[Pádraig Brady <P@xxxxxxxxxxxxxx>]

Rajeev V. Pillai wrote:
> Hello,
> 
> Cal(1) highlights the current date when run normally and also with
> the -3 and -y flags. But, this is not done when the current year is
> requested explicitly like this:
> 
> $ cal 2009
> 
> The small patch below makes `cal 2009' behave like `cal -y', which I feel
> should be the usual behaviour.

Thanks. I think that's better.
I'd prefer doing like this though...

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 2417f1b..f2d52e8 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -348,6 +348,9 @@ main(int argc, char **argv) {
        argc -= optind;
        argv += optind;

+       time(&now);
+       local_time = localtime(&now);
+
        day = month = year = 0;
        switch(argc) {
        case 3:
@@ -366,13 +369,13 @@ main(int argc, char **argv) {
                        if (day > dm)
                                errx(1, _("illegal day value: use 1-%d"), dm);
                        day = day_in_year(day, month, year);
+               } else if ((local_time->tm_year + 1900) == year) {
+                       day = local_time->tm_yday + 1;
                }
                if (!month)
                        yflag=1;
                break;
        case 0:
-               time(&now);
-               local_time = localtime(&now);
                day = local_time->tm_yday + 1;
                year = local_time->tm_year + 1900;
                month = local_time->tm_mon + 1;

--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html