expire-8601: wip new version

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/scripts/expire-iso8601.new b/scripts/expire-iso8601.new
index e586e267e7389221b05ecdfeceddfd8d2565a5b1..f001b3564ec03cbb3fabd935dd2f20b030ffc5d8 100755 (executable)
--- a/scripts/expire-iso8601.new
+++ b/scripts/expire-iso8601.new
@@ -103,18 +103,19 @@ sub precomp () {
 
 sub flag ($) {
   my ($int) = @_;
-  my $n = $int->{Number};
-  my $d = $int->{Interval};
+  my $n = $int->{N};
+  my $d = $int->{D};
+  my $dmin = $d - $slop;
   my $spec = $int->{Spec};
   my $start_age = ($n+1) * $d;
   my $i = 0;
 
-  print DEBUG "FLAG $spec\n";
+  print DEBUG "FLAG $spec sa=$start_age dmin=$dmin\n";
 
   # find $i, the youngest which is at least $number x $interval
   for (;;) {
     print DEBUG "i #$i $files[$i]{A}\n";
-    last if $files[$i]{A} > $start_age;
+    last if $files[$i]{A} >= $start_age;
     if ($i == $#files) {
       print STDERR "insufficient for $spec\n";
     }
@@ -132,7 +133,7 @@ sub flag ($) {
       last if $files[$j];
       my $dt = $files[$i]{A} - $files[$j]{A};
       print DEBUG "j #$j $files[$j]{A} dt=$dt\n";
-      last if $dt >= $d - $slop;
+      last if $dt >= $dmin;
     }
     last if $j < 0;