X-Git-Url: http://pileus.org/git/?p=lackey;a=blobdiff_plain;f=src%2Fargs.c;h=9ad0640351f706123fcd385e2c19e95bf9937031;hp=d577fdc32b64549e923d6471bd5793285c8b3864;hb=5be99a03a267ca6abf55125b76ada6d7b8ef7790;hpb=036dfbeb26c5d8b938231a8311f768e32c7cb2ed diff --git a/src/args.c b/src/args.c index d577fdc..9ad0640 100644 --- a/src/args.c +++ b/src/args.c @@ -125,11 +125,11 @@ void args_main(void) add_days(&start.year, &start.month, &start.day, d); add_days(&end.year, &end.month, &end.day, d); - /* Print day header */ wday_t wday = day_of_week(start.year, start.month, start.day); - printf("%s%s, %s %d, %d\n", - d ? "\n" : "", + if (d > 0) + printf("\n"); + printf("%s, %s %d, %d\n", day_to_string(wday), month_to_string(start.month), start.day+1, @@ -142,14 +142,19 @@ void args_main(void) /* Print event info */ int printed = 0; while (event && compare(&end, &event->start) > 0) { - printf("%s %02d:%02d", - printed ? "\n" : "", - event->start.hour, - event->start.min); + if (printed > 0) + printf("\n"); + printf("* %02d:%02d - %02d:%02d", + event->start.hour, event->start.min, + event->end.hour, event->end.min); + if (!event->name) + printf("\n"); if (event->name) printf(" %s\n", event->name); + if (event->loc) + printf(" Location: %s\n", event->loc); if (event->desc) - printf("\n %s\n", event->desc); + printf(" Description: %s\n", event->desc); printed++; event = event->next; }