Mirrors
/
noscript
mirror of https://github.com/hackademix/noscript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/tld' 

Fixed breakage in tld.js generation when for any reason the source pubblic suffix list contains CRLF characters.
This commit is contained in:
hackademix 2018-08-30 17:21:45 +02:00
parent eb158d9fa3 a103af9154
commit f18fa60109
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TLD/generate.pl
View File

@ -14,7 +14,7 @@ sub generate {
while(<DAT>) {
s/\./\\\./g;
s/\s+utf.*//;
s/\n//;
s/[\r\n]//g;
if(/^!/) {
s/^!//;
push(@ex, lc($_));
@ -42,8 +42,8 @@ sub generate {
open(SRC, $src) || die("Cannot open $src");
open(DST, ">$dst") || die("Cannot open $dst");
while(<SRC>) {
s/(_tldRx:\s*\/\(.*?\))[\s\S]*?(\$\/)/$1$rx$2/g;
s/(_tldEx:\s*\/\(.*?\))[\s\S]*?(\$\/)/$1$ex$2/g;
s/(_tldRx:\s*\/\(.*?\)).*?(?=\$\/)/$1$rx/s;
s/(_tldEx:\s*\/\(.*?\)).*?(?=\$\/)/$1$ex/s;
print DST;
print;
}