Fix some Perl statements perlcritic was bitching about: Variable

declared in conditional statement.

17 files changed, 65 insertions, 50 deletions

diff --git a/regress/sys/kern/sosplice/Proc.pm b/regress/sys/kern/sosplice/Proc.pm
index 5ec5315f8c9..39bd30df4ca 100644
--- a/regress/sys/kern/sosplice/Proc.pm
+++ b/regress/sys/kern/sosplice/Proc.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Proc.pm,v 1.3 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: Proc.pm,v 1.4 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -109,7 +109,8 @@ sub loggrep {
 	my $self = shift;
 	my($regex, $timeout) = @_;
 
-	my $end = time() + $timeout if $timeout;
+	my $end;
+	$end = time() + $timeout if $timeout;
 
 	do {
 		my($kid, $status, $code) = $self->wait(WNOHANG);
diff --git a/regress/sys/kern/sosplice/Remote.pm b/regress/sys/kern/sosplice/Remote.pm
index 293fef26be2..a5c4f9e33ea 100644
--- a/regress/sys/kern/sosplice/Remote.pm
+++ b/regress/sys/kern/sosplice/Remote.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Remote.pm,v 1.3 2015/06/25 19:29:57 bluhm Exp $
+#	$OpenBSD: Remote.pm,v 1.4 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -60,7 +60,7 @@ sub child {
 	my $self = shift;
 
 	print STDERR $self->{up}, "\n";
-	my @opts = split(' ', $ENV{SSH_OPTIONS}) if $ENV{SSH_OPTIONS};
+	my @opts = $ENV{SSH_OPTIONS} ? split(' ', $ENV{SSH_OPTIONS}) : ();
 	my $dir = dirname($0);
 	$dir = getcwd() if ! $dir || $dir eq ".";
 	my @cmd = ("ssh", "-n", @opts, $self->{remotessh}, "perl",
diff --git a/regress/sys/kern/sosplice/error/remote.pl b/regress/sys/kern/sosplice/error/remote.pl
index ae7e50bf1c2..84bd23a300a 100644
--- a/regress/sys/kern/sosplice/error/remote.pl
+++ b/regress/sys/kern/sosplice/error/remote.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-#	$OpenBSD: remote.pl,v 1.2 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: remote.pl,v 1.3 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -28,7 +28,7 @@ sub usage {
 
 my($remotessh, $testfile) = @ARGV;
 
-my @opts = split(' ', $ENV{SSH_OPTIONS}) if $ENV{SSH_OPTIONS};
+my @opts = $ENV{SSH_OPTIONS} ? split(' ', $ENV{SSH_OPTIONS}) : ();
 my $dir = dirname($0);
 $dir = getcwd() if ! $dir || $dir eq ".";
 my @cmd = ("ssh", "-n", @opts, $remotessh, "perl",
diff --git a/regress/sys/kern/sosplice/funcs.pl b/regress/sys/kern/sosplice/funcs.pl
index aab739f3a62..75856ce6600 100644
--- a/regress/sys/kern/sosplice/funcs.pl
+++ b/regress/sys/kern/sosplice/funcs.pl
@@ -1,4 +1,4 @@
-#	$OpenBSD: funcs.pl,v 1.7 2014/08/18 21:51:45 bluhm Exp $
+#	$OpenBSD: funcs.pl,v 1.8 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2013 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -658,11 +658,12 @@ sub check_relay {
 sub check_len {
 	my ($c, $r, $s, %args) = @_;
 
-	my $clen = $c->loggrep(qr/^LEN: /) // die "no client len"
+	my ($clen, $rlen, $slen);
+	$clen = $c->loggrep(qr/^LEN: /) // die "no client len"
 	    unless $args{client}{nocheck};
-	my $rlen = $r->loggrep(qr/^LEN: /) // die "no relay len"
+	$rlen = $r->loggrep(qr/^LEN: /) // die "no relay len"
 	    if $r && ! $args{relay}{nocheck};
-	my $slen = $s->loggrep(qr/^LEN: /) // die "no server len"
+	$slen = $s->loggrep(qr/^LEN: /) // die "no server len"
 	    unless $args{server}{nocheck};
 	!$clen || !$rlen || $clen eq $rlen
 	    or die "client: $clen", "relay: $rlen", "len mismatch";
@@ -681,9 +682,10 @@ sub check_len {
 sub check_lengths {
 	my ($c, $r, $s, %args) = @_;
 
-	my $clengths = $c->loggrep(qr/^LENGTHS: /)
+	my ($clengths, $slengths);
+	$clengths = $c->loggrep(qr/^LENGTHS: /)
 	    unless $args{client}{nocheck};
-	my $slengths = $s->loggrep(qr/^LENGTHS: /)
+	$slengths = $s->loggrep(qr/^LENGTHS: /)
 	    unless $args{server}{nocheck};
 	!$clengths || !$slengths || $clengths eq $slengths
 	    or die "client: $clengths", "server: $slengths", "lengths mismatch";
@@ -698,8 +700,9 @@ sub check_lengths {
 sub check_md5 {
 	my ($c, $r, $s, %args) = @_;
 
-	my $cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
-	my $smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
+	my ($cmd5, $smd5);
+	$cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
+	$smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
 	!$cmd5 || !$smd5 || ref($args{md5}) eq 'ARRAY' || $cmd5 eq $smd5
 	    or die "client: $cmd5", "server: $smd5", "md5 mismatch";
 	my $md5 = ref($args{md5}) eq 'ARRAY' ?
diff --git a/regress/sys/net/pf_divert/Proc.pm b/regress/sys/net/pf_divert/Proc.pm
index 2ee3bf6cf03..34f09bc92eb 100644
--- a/regress/sys/net/pf_divert/Proc.pm
+++ b/regress/sys/net/pf_divert/Proc.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Proc.pm,v 1.3 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: Proc.pm,v 1.4 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -109,7 +109,8 @@ sub loggrep {
 	my $self = shift;
 	my($regex, $timeout) = @_;
 
-	my $end = time() + $timeout if $timeout;
+	my $end;
+	$end = time() + $timeout if $timeout;
 
 	do {
 		my($kid, $status, $code) = $self->wait(WNOHANG);
diff --git a/regress/sys/net/pf_divert/Remote.pm b/regress/sys/net/pf_divert/Remote.pm
index 4998fbe7905..13ea67dedc1 100644
--- a/regress/sys/net/pf_divert/Remote.pm
+++ b/regress/sys/net/pf_divert/Remote.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Remote.pm,v 1.5 2015/06/25 19:29:57 bluhm Exp $
+#	$OpenBSD: Remote.pm,v 1.6 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -66,7 +66,7 @@ sub child {
 	my $self = shift;
 
 	print STDERR $self->{up}, "\n";
-	my @opts = split(' ', $ENV{SSH_OPTIONS}) if $ENV{SSH_OPTIONS};
+	my @opts = $ENV{SSH_OPTIONS} ? split(' ', $ENV{SSH_OPTIONS}) : ();
 	my @sudo = $ENV{SUDO} ? ($ENV{SUDO}, "SUDO=$ENV{SUDO}") : ();
 	my $dir = dirname($0);
 	$dir = getcwd() if ! $dir || $dir eq ".";
diff --git a/regress/usr.sbin/httpd/tests/Proc.pm b/regress/usr.sbin/httpd/tests/Proc.pm
index 8f46012b23d..a98cc176d79 100644
--- a/regress/usr.sbin/httpd/tests/Proc.pm
+++ b/regress/usr.sbin/httpd/tests/Proc.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Proc.pm,v 1.1 2015/07/16 16:35:57 reyk Exp $
+#	$OpenBSD: Proc.pm,v 1.2 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -147,7 +147,8 @@ sub loggrep {
 	my $self = shift;
 	my($regex, $timeout) = @_;
 
-	my $end = time() + $timeout if $timeout;
+	my $end;
+	$end = time() + $timeout if $timeout;
 
 	do {
 		my($kid, $status, $code) = $self->wait(WNOHANG);
diff --git a/regress/usr.sbin/httpd/tests/funcs.pl b/regress/usr.sbin/httpd/tests/funcs.pl
index 9a0db7e4299..beda09ac5f6 100644
--- a/regress/usr.sbin/httpd/tests/funcs.pl
+++ b/regress/usr.sbin/httpd/tests/funcs.pl
@@ -1,4 +1,4 @@
-#	$OpenBSD: funcs.pl,v 1.5 2015/07/18 19:17:13 benno Exp $
+#	$OpenBSD: funcs.pl,v 1.6 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -425,7 +425,8 @@ sub check_len {
 
 	$args{len} ||= 512 unless $args{lengths};
 
-	my @clen = $c->loggrep(qr/^LEN: /) or die "no client len"
+	my @clen;
+	@clen = $c->loggrep(qr/^LEN: /) or die "no client len"
 	    unless $args{client}{nocheck};
 #	!@clen
 #	    or die "client: @clen", "len mismatch";
@@ -445,7 +446,8 @@ sub check_len {
 sub check_md5 {
 	my ($c, $r, %args) = @_;
 
-	my @cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
+	my @cmd5;
+	@cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
 	my @md5 = ref($args{md5}) eq 'ARRAY' ? @{$args{md5}} : $args{md5} || ()
 	    or return;
 	foreach my $md5 (@md5) {
diff --git a/regress/usr.sbin/httpd/tests/httpd.pl b/regress/usr.sbin/httpd/tests/httpd.pl
index 481a5871136..6ca2d83d88f 100644
--- a/regress/usr.sbin/httpd/tests/httpd.pl
+++ b/regress/usr.sbin/httpd/tests/httpd.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-#	$OpenBSD: httpd.pl,v 1.1 2015/07/16 16:35:57 reyk Exp $
+#	$OpenBSD: httpd.pl,v 1.2 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org>
 # Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -41,7 +41,8 @@ if (@ARGV and -f $ARGV[-1]) {
 my $redo = $args{lengths} && @{$args{lengths}};
 $redo = 0 if $args{client}{http_vers};  # run only one persistent connection
 my($sport, $rport) = find_ports(num => 2);
-my $d = Httpd->new(
+my($d, $c);
+$d = Httpd->new(
     chroot              => $ARGV[0],
     listendomain        => AF_INET,
     listenaddr          => "127.0.0.1",
@@ -52,7 +53,7 @@ my $d = Httpd->new(
     %{$args{httpd}},
     testfile            => $testfile,
 );
-my $c = Client->new(
+$c = Client->new(
     chroot              => $ARGV[0],
     func                => \&http_client,
     connectdomain       => AF_INET,
diff --git a/regress/usr.sbin/ospfd/Proc.pm b/regress/usr.sbin/ospfd/Proc.pm
index a7edfd491e2..6a990d96dfe 100644
--- a/regress/usr.sbin/ospfd/Proc.pm
+++ b/regress/usr.sbin/ospfd/Proc.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Proc.pm,v 1.3 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: Proc.pm,v 1.4 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 # Copyright (c) 2014 Florian Riehm <mail@friehm.de>
@@ -137,7 +137,8 @@ sub loggrep {
 	my $self = shift;
 	my($regex, $timeout) = @_;
 
-	my $end = time() + $timeout if $timeout;
+	my $end;
+	$end = time() + $timeout if $timeout;
 
 	do {
 		my($kid, $status, $code) = $self->wait(WNOHANG);
diff --git a/regress/usr.sbin/relayd/Proc.pm b/regress/usr.sbin/relayd/Proc.pm
index 8dfe730fe11..f7cecbc6ddc 100644
--- a/regress/usr.sbin/relayd/Proc.pm
+++ b/regress/usr.sbin/relayd/Proc.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Proc.pm,v 1.10 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: Proc.pm,v 1.11 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -147,7 +147,8 @@ sub loggrep {
 	my $self = shift;
 	my($regex, $timeout) = @_;
 
-	my $end = time() + $timeout if $timeout;
+	my $end;
+	$end = time() + $timeout if $timeout;
 
 	do {
 		my($kid, $status, $code) = $self->wait(WNOHANG);
diff --git a/regress/usr.sbin/relayd/Remote.pm b/regress/usr.sbin/relayd/Remote.pm
index 051b82c5af9..552bb82c7bf 100644
--- a/regress/usr.sbin/relayd/Remote.pm
+++ b/regress/usr.sbin/relayd/Remote.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Remote.pm,v 1.6 2015/06/25 19:29:57 bluhm Exp $
+#	$OpenBSD: Remote.pm,v 1.7 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -84,7 +84,7 @@ sub up {
 sub child {
 	my $self = shift;
 
-	my @opts = split(' ', $ENV{SSH_OPTIONS}) if $ENV{SSH_OPTIONS};
+	my @opts = $ENV{SSH_OPTIONS} ? split(' ', $ENV{SSH_OPTIONS}) : ();
 	my @sudo = $ENV{SUDO} ? "SUDO=$ENV{SUDO}" : ();
 	my @ktrace = $ENV{KTRACE} ? "KTRACE=$ENV{KTRACE}" : ();
 	my @relayd = $ENV{RELAYD} ? "RELAYD=$ENV{RELAYD}" : ();
diff --git a/regress/usr.sbin/relayd/funcs.pl b/regress/usr.sbin/relayd/funcs.pl
index 3537248fc9e..06fffffe344 100644
--- a/regress/usr.sbin/relayd/funcs.pl
+++ b/regress/usr.sbin/relayd/funcs.pl
@@ -1,4 +1,4 @@
-#	$OpenBSD: funcs.pl,v 1.21 2015/07/20 05:37:49 bluhm Exp $
+#	$OpenBSD: funcs.pl,v 1.22 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -505,9 +505,10 @@ sub check_len {
 
 	$args{len} ||= 251 unless $args{lengths};
 
-	my @clen = $c->loggrep(qr/^LEN: /) or die "no client len"
+	my (@clen, @slen);
+	@clen = $c->loggrep(qr/^LEN: /) or die "no client len"
 	    unless $args{client}{nocheck};
-	my @slen = $s->loggrep(qr/^LEN: /) or die "no server len"
+	@slen = $s->loggrep(qr/^LEN: /) or die "no server len"
 	    unless $args{server}{nocheck};
 	!@clen || !@slen || @clen ~~ @slen
 	    or die "client: @clen", "server: @slen", "len mismatch";
@@ -534,8 +535,9 @@ sub check_len {
 sub check_md5 {
 	my ($c, $r, $s, %args) = @_;
 
-	my @cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
-	my @smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
+	my (@cmd5, @smd5);
+	@cmd5 = $c->loggrep(qr/^MD5: /) unless $args{client}{nocheck};
+	@smd5 = $s->loggrep(qr/^MD5: /) unless $args{server}{nocheck};
 	!@cmd5 || !@smd5 || $cmd5[0] eq $smd5[0]
 	    or die "client: $cmd5[0]", "server: $smd5[0]", "md5 mismatch";
 
diff --git a/regress/usr.sbin/relayd/relayd.pl b/regress/usr.sbin/relayd/relayd.pl
index 936ddeb7d4d..904a8e4d98c 100644
--- a/regress/usr.sbin/relayd/relayd.pl
+++ b/regress/usr.sbin/relayd/relayd.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-#	$OpenBSD: relayd.pl,v 1.13 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: relayd.pl,v 1.14 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -41,7 +41,8 @@ if (@ARGV and -f $ARGV[-1]) {
 my $redo = $args{lengths} && @{$args{lengths}};
 $redo = 0 if $args{client}{http_vers};  # run only one persistent connection
 my($sport, $rport) = find_ports(num => 2);
-my $s = Server->new(
+my($s, $r, $c);
+$s = Server->new(
     forward             => $ARGV[0],
     func                => \&read_char,
     listendomain        => AF_INET,
@@ -51,7 +52,7 @@ my $s = Server->new(
     %{$args{server}},
     testfile            => $testfile,
 ) unless $args{server}{noserver};
-my $r = Relayd->new(
+$r = Relayd->new(
     forward             => $ARGV[0],
     listendomain        => AF_INET,
     listenaddr          => "127.0.0.1",
@@ -62,7 +63,7 @@ my $r = Relayd->new(
     %{$args{relayd}},
     testfile            => $testfile,
 );
-my $c = Client->new(
+$c = Client->new(
     forward             => $ARGV[0],
     func                => \&write_char,
     connectdomain       => AF_INET,
diff --git a/regress/usr.sbin/relayd/remote.pl b/regress/usr.sbin/relayd/remote.pl
index c552633aeec..12fe6db86e6 100644
--- a/regress/usr.sbin/relayd/remote.pl
+++ b/regress/usr.sbin/relayd/remote.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-#	$OpenBSD: remote.pl,v 1.7 2014/08/18 22:58:19 bluhm Exp $
+#	$OpenBSD: remote.pl,v 1.8 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -56,7 +56,7 @@ my $mode =
 	@ARGV == 4 && $ARGV[1] !~ /^\d+$/ && $ARGV[3] !~ /^\d+$/ ? "auto"   :
 	usage();
 
-my $r;
+my($s, $r, $c);
 if ($mode eq "relay") {
 	my($rport) = find_ports(num => 1);
 	$r = Relayd->new(
@@ -98,7 +98,7 @@ if ($mode eq "relay") {
 
 my $redo = $args{lengths} && @{$args{lengths}};
 $redo = 0 if $args{client}{http_vers};  # run only one persistent connection
-my $s = Server->new(
+$s = Server->new(
     forward             => $ARGV[0],
     func                => \&read_char,
     redo                => $redo,
@@ -121,7 +121,7 @@ if ($mode eq "auto") {
 	);
 	$r->run->up;
 }
-my $c = Client->new(
+$c = Client->new(
     forward             => $ARGV[0],
     func                => \&write_char,
     %{$args{client}},
diff --git a/regress/usr.sbin/syslogd/Proc.pm b/regress/usr.sbin/syslogd/Proc.pm
index 1a8d47bc2b3..f2dde53614c 100644
--- a/regress/usr.sbin/syslogd/Proc.pm
+++ b/regress/usr.sbin/syslogd/Proc.pm
@@ -1,4 +1,4 @@
-#	$OpenBSD: Proc.pm,v 1.7 2015/07/09 21:12:44 bluhm Exp $
+#	$OpenBSD: Proc.pm,v 1.8 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org>
 # Copyright (c) 2014 Florian Riehm <mail@friehm.de>
@@ -164,7 +164,8 @@ sub loggrep {
 	my($regex, $timeout, $count) = @_;
 	my $exit = ($self->{exit} // 0) << 8;
 
-	my $end = time() + $timeout if $timeout;
+	my $end;
+	$end = time() + $timeout if $timeout;
 
 	do {
 		my($kid, $status, $code) = $self->wait(WNOHANG);
diff --git a/regress/usr.sbin/syslogd/syslogd.pl b/regress/usr.sbin/syslogd/syslogd.pl
index fe1b70b2b76..196d6d1690c 100644
--- a/regress/usr.sbin/syslogd/syslogd.pl
+++ b/regress/usr.sbin/syslogd/syslogd.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-#	$OpenBSD: syslogd.pl,v 1.8 2015/09/03 18:14:35 bluhm Exp $
+#	$OpenBSD: syslogd.pl,v 1.9 2016/05/03 19:13:04 bluhm Exp $
 
 # Copyright (c) 2010-2014 Alexander Bluhm <bluhm@openbsd.org>
 #
@@ -53,7 +53,7 @@ foreach my $name (qw(client syslogd server rsyslogd)) {
 		}
 	}
 }
-my($s, $c, $r, @m);
+my($s, $c, $r, $rc, @m);
 $s = RSyslogd->new(
     %{$args{rsyslogd}},
     listenport          => scalar find_ports(%{$args{rsyslogd}{listen}}),
@@ -85,7 +85,7 @@ $r = Syslogd->new(
     client              => \$c,
     server              => \$s,
 );
-my $rc = RSyslogd->new(
+$rc = RSyslogd->new(
     %{$args{rsyslogd}},
     listenport          => scalar find_ports(%{$args{rsyslogd}{listen}}),
     testfile            => $testfile,