X-Git-Url: https://git.jankratochvil.net/?p=redirector-ad.git;a=blobdiff_plain;f=redirector;h=380174238fb17f0088e8c4d471bb84e2c410f0be;hp=1d7718b0d0d1fb653e6da70d38b24f09eb16b89e;hb=HEAD;hpb=a1632dacd7cd7b054d732f468e1a58eaff23a767

diff --git a/redirector b/redirector
index 1d7718b..3801742 100755
--- a/redirector
+++ b/redirector
@@ -4,30 +4,43 @@
 
 use strict;
 use warnings;
+use File::Basename;
 
 use re 'eval';
 
-use constant DIR_AD => "/usr/local/squid/etc/ad";
+my $DIR_AD=dirname($0)."/ad";
 
 
-chdir DIR_AD or die "chdir ".DIR_AD.": $!";
-
-my($patt)="";
-open(M4,"-|","m4 -P main") or die "m4 run: $!";
-while (<M4>) {
-	chomp;
-	next if !$_;
-	$patt.="|" if $patt;
-	$patt.=$_."(?{ '";
-	s/'/'."'".'/g;
-	$patt.="$_'; })";
-	}
-close M4;
-
+chdir $DIR_AD or die "chdir $DIR_AD: $!";
 select STDOUT;
 $|=1;
-
-while (<>) {
-	s@^http://($patt).*\n$@http://localhost/cgi-bin/redirector-ad.cgi?$^R\n@os;
-	print;
-	}
+my @got;
+
+RELOAD: {
+	my $patt="";
+	open(M4,"-|","m4 --prefix-builtins --synclines main") or die "m4 run: $!";
+	my %files;
+	while (<M4>) {
+		chomp;
+		next if !$_;
+		do { $files{$1}=undef; next; } if /^#\s*line\s+\d+\s+"(.*)"$/;
+		$patt.="|" if $patt;
+		$patt.=$_."(?{ '";
+		s/'/'."'".'/g;
+		$patt.="$_'; })";
+		}
+	close M4;
+	$patt=qr @^http://($patt).*\n$@;
+
+	while ($_=shift @got || <>) {
+		while (my($file,$old)=each %files) {
+			my $new=(stat $file)[9];
+			$files{$file}=$new;
+			next if !defined $old || $old==$new;
+			push @got,$_;
+			redo RELOAD;
+			}
+		s@$patt@http://localhost/cgi-bin/redirector-ad.cgi?$^R\n@;
+		print;
+		}
+	} # RELOAD