Skip to content

remove 'o' modifier from Perl regular expressions #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maletin wants to merge 1 commit into from
Closed

remove 'o' modifier from Perl regular expressions #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions check_postgres.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ package check_postgres;
RCLINE:
while (<$rc>) {
next if /^\s*#/;
next unless /^\s*(\w+)\s*=\s*(.+?)\s*$/o;
next unless /^\s*(\w+)\s*=\s*(.+?)\s*$/;
my ($name,$value) = ($1,$2); ## no critic (ProhibitCaptureWithoutTest)
## Map alternate option spellings to preferred names
if ($name eq 'dbport' or $name eq 'p' or $name eq 'dbport1' or $name eq 'p1' or $name eq 'port1') {
Expand All @@ -1161,16 +1161,16 @@ package check_postgres;
$name = 'dbuser';
}
## Now for all the additional non-1 databases
elsif ($name =~ /^dbport(\d+)$/o or $name eq /^p(\d+)$/o) {
elsif ($name =~ /^dbport(\d+)$/ or $name eq /^p(\d+)$/) {
$name = "port$1";
}
elsif ($name =~ /^dbhost(\d+)$/o or $name eq /^H(\d+)$/o) {
elsif ($name =~ /^dbhost(\d+)$/ or $name eq /^H(\d+)$/) {
$name = "host$1";
}
elsif ($name =~ /^db(\d)$/o) {
elsif ($name =~ /^db(\d)$/) {
$name = "dbname$1";
}
elsif ($name =~ /^u(\d+)$/o) {
elsif ($name =~ /^u(\d+)$/) {
$name = "dbuser$1";
}

Expand Down Expand Up @@ -1256,24 +1256,24 @@ package check_postgres;
while (my $arg = pop @ARGV) {

## These must be of the form x=y
if ($arg =~ /^\-?\-?(\w+)\s*=\s*(.+)/o) {
if ($arg =~ /^\-?\-?(\w+)\s*=\s*(.+)/) {
my ($name,$value) = (lc $1, $2);
if ($name =~ /^(?:db)?port(\d+)$/o or $name =~ /^p(\d+)$/o) {
if ($name =~ /^(?:db)?port(\d+)$/ or $name =~ /^p(\d+)$/) {
push @{ $opt{port} } => $value;
}
elsif ($name =~ /^(?:db)?host(\d+)$/o or $name =~ /^H(\d+)$/o) {
elsif ($name =~ /^(?:db)?host(\d+)$/ or $name =~ /^H(\d+)$/) {
push @{ $opt{host} } => $value;
}
elsif ($name =~ /^db(?:name)?(\d+)$/o) {
elsif ($name =~ /^db(?:name)?(\d+)$/) {
push @{ $opt{dbname} } => $value;
}
elsif ($name =~ /^dbuser(\d+)$/o or $name =~ /^u(\d+)/o) {
elsif ($name =~ /^dbuser(\d+)$/ or $name =~ /^u(\d+)/) {
push @{ $opt{dbuser} } => $value;
}
elsif ($name =~ /^dbpass(\d+)$/o) {
elsif ($name =~ /^dbpass(\d+)$/) {
push @{ $opt{dbpass} } => $value;
}
elsif ($name =~ /^dbservice(\d+)$/o) {
elsif ($name =~ /^dbservice(\d+)$/) {
push @{ $opt{dbservice} } => $value;
}
else {
Expand Down Expand Up @@ -1922,10 +1922,10 @@ sub finishup {
my $showdebug = 0;
if ($DEBUGOUTPUT) {
$showdebug = 1 if $DEBUGOUTPUT =~ /a/io
or ($DEBUGOUTPUT =~ /c/io and $type eq 'c')
or ($DEBUGOUTPUT =~ /w/io and $type eq 'w')
or ($DEBUGOUTPUT =~ /o/io and $type eq 'o')
or ($DEBUGOUTPUT =~ /u/io and $type eq 'u');
or ($DEBUGOUTPUT =~ /c/i and $type eq 'c')
or ($DEBUGOUTPUT =~ /w/i and $type eq 'w')
or ($DEBUGOUTPUT =~ /o/i and $type eq 'o')
or ($DEBUGOUTPUT =~ /u/i and $type eq 'u');
}
for (sort keys %$info) {
printf '%s %s%s ',
Expand Down Expand Up @@ -2678,7 +2678,7 @@ sub run_command {
$db->{slurp} = '' if ! defined $db->{slurp} or index($db->{slurp},'(')==0;

## Allow an empty query (no matching rows) if requested
if ($arg->{emptyok} and $db->{slurp} =~ /^\s*$/o) {
if ($arg->{emptyok} and $db->{slurp} =~ /^\s*$/) {
$arg->{emptyok2} = 1;
}
## If we just want a version, grab it and redo
Expand Down Expand Up @@ -3043,7 +3043,7 @@ sub skip_item {
if (defined $opt{exclude}) {
$stat = 1;
for (@{$opt{exclude}}) {
for my $ex (split /\s*,\s*/o => $_) {
for my $ex (split /\s*,\s*/ => $_) {
if ($ex =~ s/\.$//) {
if ($ex =~ s/^~//) {
($stat += 2 and last) if $schema =~ /$ex/;
Expand All @@ -3064,7 +3064,7 @@ sub skip_item {
if (defined $opt{include}) {
$stat += 4;
for (@{$opt{include}}) {
for my $in (split /\s*,\s*/o => $_) {
for my $in (split /\s*,\s*/ => $_) {
if ($in =~ s/\.$//) {
if ($in =~ s/^~//) {
($stat += 8 and last) if $schema =~ /$in/;
Expand Down Expand Up @@ -3903,7 +3903,7 @@ sub check_bloat {

$db = $info->{db}[0];

if ($db->{slurp} !~ /\w+/o) {
if ($db->{slurp} !~ /\w+/) {
add_ok msg('bloat-nomin') unless $MRTG;
return;
}
Expand Down Expand Up @@ -4302,7 +4302,7 @@ sub check_connection {
return;
}

my $ver = ($db->{slurp}[0]{v} =~ /(\d+\.\d+\S+)/o) ? $1 : '';
my $ver = ($db->{slurp}[0]{v} =~ /(\d+\.\d+\S+)/) ? $1 : '';

$MRTG and do_mrtg({one => $ver ? 1 : 0});

Expand Down Expand Up @@ -6549,12 +6549,12 @@ sub check_same_schema {
for my $phrase (split /[\s,]+/ => $item) {

## Can be plain (e.g. nouser) or regex based exclusion, e.g. nouser=bob
next if $phrase !~ /(\w+)=?\s*(.*)/o;
next if $phrase !~ /(\w+)=?\s*(.*)/;
my ($name,$regex) = (lc $1,$2||'');

## Names are standardized with regards to plurals and casing
$name =~ s/([aeiou])s$/$1/o;
$name =~ s/s$//o;
$name =~ s/([aeiou])s$/$1/;
$name =~ s/s$//;

if (! length $regex) {
$filter{"$name"} = 1;
Expand Down Expand Up @@ -7922,19 +7922,19 @@ sub check_txn_idle {
my $st = $r->{state} || '';

## Return unknown if we cannot see because we are a non-superuser
if ($cq =~ /insufficient/o) {
if ($cq =~ /insufficient/) {
add_unknown msg('psa-nosuper');
return;
}

## Return unknown if stats_command_string / track_activities is off
if ($st =~ /disabled/o or $cq =~ /<command string not enabled>/) {
if ($st =~ /disabled/ or $cq =~ /<command string not enabled>/) {
add_unknown msg('psa-disabled');
return;
}

## Detect other cases where pg_stat_activity is not fully populated
if ($type ne 'qtime' and length $r->{xact_start} and $r->{xact_start} !~ /\d/o) {
if ($type ne 'qtime' and length $r->{xact_start} and $r->{xact_start} !~ /\d/) {
add_unknown msg('psa-noexact');
return;
}
Expand Down Expand Up @@ -8145,7 +8145,7 @@ sub check_version {

for $db (@{$info->{db}}) {
my $row = $db->{slurp}[0];
if ($row->{version} !~ /((\d+\.\d+)(\w+|\.\d+))/o) {
if ($row->{version} !~ /((\d+\.\d+)(\w+|\.\d+))/) {
add_unknown msg('invalid-query', $row->{version});
next;
}
Expand Down