Accumulated changes

Author: brablc

chkurl

@@ -5,8 +5,8 @@ if [[ $1 == '-r' ]]; then
     RECURSE=1
 fi
 URL=${1?Usage: $0 [-r] <URL>}
-read URL RETCODE NEWURL < <(curl -o /dev/null --silent --head --write-out "$URL %{http_code} %{redirect_url}\n" "$URL")
-echo $URL $RETCODE $NEWURL
+read URL RETCODE TTTL NEWURL < <(curl -o /dev/null --silent --head --write-out "$URL %{http_code} %{time_total} %{redirect_url}\n" "$URL")
+echo $URL $RETCODE $TTTL $NEWURL
 if [[ $RECURSE == 1 && ( $RETCODE == '301' || $RETCODE == '302' ) ]]; then
     $0 -r $NEWURL
 fi

ip2host

@@ -4,13 +4,13 @@ perl -MSocket -plane '
 	BEGIN {
 		%CACHE=();
 		sub gethost {
-			$ip = join( ".", unpack "C4", pack "N", $1);
+			$ip = $1;
 			unless (defined $CACHE{$ip}) {
-				@name = gethostbyaddr(inet_aton($1),AF_INET);
-				$CACHE{$ip} = $name[0] ? $name[0] : $1;
+				@name = gethostbyaddr(inet_aton($ip),AF_INET);
+				$CACHE{$ip} = $name[0] ? $name[0] : $ip;
 			}
 			return $CACHE{$ip};
 		}
 	}
-	s/\b(([0-9]{1,3}\.){3}([0-9]{1,3}))\b/gethost($1)/eg;
+	s/\b(([0-9]{1,3}\.){3}([0-9]{1,3}))\b/$1." ".gethost($1)/eg;
 '

ipinfo

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl -s ipinfo.io/$1 | jq .

postqueuefmt

@@ -1,24 +1,27 @@
 #!/usr/bin/perl
 
-while (<POSTQUEUE>) {
+while (<>) {
     if (/^(\w+)(\*|\!)?\s/) {
+        $header = $_;
         $queue_id = $1;
-        $_ = <POSTQUEUE>;
+        $_ = <>;
         chop;
         $msg = $_;
 
         if (/^\(.*(\d{3}) (\d.\d.\d) .*\)$/) {
             $reply = $1;
             $error = $2;
 
-            $_ = <POSTQUEUE>;
+            $_ = <>;
             chop;
             s/\s+//g;
             $email = $_;
 
             print "$queue_id $reply $error $email $msg\n";
+        } elsif ($header =~ /MAILER-DAEMON/) {
+            print "$queue_id -- MAILER-DAEMON\n";
+        } else {
+            print "$queue_id -- PARSE-ERROR\n";
         }
     }
 }
-
-close(POSTQUEUE);