From 1ed1f30a426307cfbf4d41aeae7bc94367f598a2 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Sun, 12 Jul 2020 10:07:01 +0000 Subject: [PATCH] MFC r340655 pom: Fix fencepost bugs. PR: 231705 Submitted by: Andrew Gierth Approved by: allanjude (mentor) --- usr.bin/pom/pom.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.bin/pom/pom.c b/usr.bin/pom/pom.c index 5c95dcda6ad..8e7bf8d8f84 100644 --- a/usr.bin/pom/pom.c +++ b/usr.bin/pom/pom.c @@ -135,11 +135,13 @@ main(int argc, char **argv) tmd.tm_hour = 0; tmd.tm_min = 0; tmd.tm_sec = 0; + tmd.tm_isdst = -1; } if (otime != NULL) { tmd.tm_hour = strtol(otime, NULL, 10); tmd.tm_min = strtol(otime + 3, NULL, 10); tmd.tm_sec = strtol(otime + 6, NULL, 10); + tmd.tm_isdst = -1; } tt = mktime(&tmd); } @@ -149,19 +151,19 @@ main(int argc, char **argv) (GMT.tm_min / 60.0) + (GMT.tm_sec / 3600.0)) / 24.0); for (cnt = EPOCH; cnt < GMT.tm_year; ++cnt) days += isleap(1900 + cnt) ? 366 : 365; - today = potm(days) + .5; + today = potm(days); if (pflag) { (void)printf("%1.0f\n", today); return (0); } (void)printf("The Moon is "); - if ((int)today == 100) + if (today >= 99.5) (void)printf("Full\n"); - else if (!(int)today) + else if (today < 0.5) (void)printf("New\n"); else { tomorrow = potm(days + 1); - if ((int)today == 50) + if (today >= 49.5 && today < 50.5) (void)printf("%s\n", tomorrow > today ? "at the First Quarter" : "at the Last Quarter"); else { -- 2.45.0