Commit: 3996e01a7f79ee9525521ab22b587dc5af2b2bb7 - addr2country (git)

Commit MetaInfo

• Revisão: 3996e01a7f79ee9525521ab22b587dc5af2b2bb7 (tree)
• Hora: 2022-04-10 02:51:29
• Autor: dyknon <dyknon@user...>
• Commiter: dyknon

Mensagem de Log

better padding + fix cidr handling

Mudança Sumário

• modified: ip2cc_index.pl

Diff

--- a/ip2cc_index.pl
+++ b/ip2cc_index.pl
@@ -328,8 +328,7 @@ sub get_pad_ascii_formatter{
     my %len_part = $asciilen{$type}->%*;
     my $len = @vals
         + (sum0 map{$_->{len}}@vals)
-        + $len_part{addr}
-        + 1;
+        + $len_part{addr};
     if($cidr){
         $len += $len_part{cidrnm}+1;
     }else{
@@ -337,10 +336,11 @@ sub get_pad_ascii_formatter{
     }
     my $inner = get_ascii_formatter($type, $cidr, @vals);
     sub{
-        my $line = $inner->(@_);
-        my $padn = $len - length $line;
-        die if($padn < 0);
-        "$line\t" . " "x$padn;
+        map{
+            my $padn = $len - length $_;
+            die if($padn < 0);
+            "$_\t" . " "x$padn;
+        }$inner->(@_);
     };
 }
 sub get_binary_formatter{
@@ -486,7 +486,7 @@ if($op eq "generate"){
         }
 
         my @formats = keys %formatters;
-        @formats = grep{!/^cidr/}@formats if($cidr);
+        @formats = grep{!/^cidr/}@formats if(!$cidr);
 
         if($address_sort){
             for(@formats){