Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 20 Nov 2018 00:06:53 +0000 (UTC)
From:      Thomas Munro <tmunro@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340655 - head/usr.bin/pom
Message-ID:  <201811200006.wAK06rcl070629@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tmunro
Date: Tue Nov 20 00:06:53 2018
New Revision: 340655
URL: https://svnweb.freebsd.org/changeset/base/340655

Log:
  pom: Fix fencepost bugs.
  
  Under some conditions pom would report "waning" and then "full", show
  higher percentages than it should, and get confused by DST.  Fix.
  
  Before:
  
    2018.01.30: The Moon is Waxing Gibbous (97% of Full)
    2018.01.31: The Moon is Waning Gibbous (100% of Full)
    2018.02.01: The Moon is Full
    2018.02.02: The Moon is Waning Gibbous (98% of Full)
  
  After:
  
    2018.01.30: The Moon is Waxing Gibbous (96% of Full)
    2018.01.31: The Moon is Waxing Gibbous (99% of Full)
    2018.02.01: The Moon is Full
    2018.02.02: The Moon is Waning Gibbous (97% of Full)
  
  PR:                    231705
  Submitted by:          Andrew Gierth
  Approved by:           allanjude (mentor)
  MFC after:             2 weeks
  Differential Revision: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=231705

Modified:
  head/usr.bin/pom/pom.c

Modified: head/usr.bin/pom/pom.c
==============================================================================
--- head/usr.bin/pom/pom.c	Mon Nov 19 23:56:33 2018	(r340654)
+++ head/usr.bin/pom/pom.c	Tue Nov 20 00:06:53 2018	(r340655)
@@ -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 {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811200006.wAK06rcl070629>