Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #213 from rhansen/regex-flag-compat

Browse source 
Remove the `/a` regex flag
This commit is contained in:
Sandro 2020-07-01 00:37:13 +02:00 committed by GitHub
commit 43c0581334
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ddclient.in
View file

@ -40,7 +40,7 @@ my $hostname = hostname();
# to run this file as a Perl script before those substitutions are made. # to run this file as a Perl script before those substitutions are made.
sub subst_var { sub subst_var {
my ($subst, $default) = @_; my ($subst, $default) = @_;
return $default if $subst =~ qr'^@\w+@$'a; return $default if $subst =~ qr'^@\w+@$';
return $subst; return $subst;
} }
@ -2318,7 +2318,7 @@ sub is_ipv4 {
## Accepts leading zeros in the address but removes them in returned value ## Accepts leading zeros in the address but removes them in returned value
###################################################################### ######################################################################
sub extract_ipv4 { sub extract_ipv4 {
(shift // '') =~ /\b((?:(?<octet>25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?&octet))\b/a (shift // '') =~ /\b((?:(?<octet>25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?&octet))\b/
or return undef; or return undef;
(my $ip = $1) =~ s/\b0+\B//g; ## remove embedded leading zeros (my $ip = $1) =~ s/\b0+\B//g; ## remove embedded leading zeros
return $ip; return $ip;
@ -2346,7 +2346,7 @@ sub extract_ipv6 {
my @values = split('\n', $content); my @values = split('\n', $content);
foreach my $val (@values) { foreach my $val (@values) {
next unless $val =~ /((:{0,2}[A-F0-9]{1,4}){0,7}:{1,2}[A-F0-9]{1,4})/ai; # invalid char next unless $val =~ /((:{0,2}[A-F0-9]{1,4}){0,7}:{1,2}[A-F0-9]{1,4})/i; # invalid char
my $parsed = $1; my $parsed = $1;
# check for at least 7 colons # check for at least 7 colons