From ecca77fdad18d2db18fff39f438c85b76713005b Mon Sep 17 00:00:00 2001
From: Joe Cooper <joe@virtualmin.com>
Date: Fri, 17 Jun 2016 22:38:16 -0700
Subject: [PATCH] strict/warn

---
 at/linux-lib.pl | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/at/linux-lib.pl b/at/linux-lib.pl
index 9f15440b7..fa139244d 100755
--- a/at/linux-lib.pl
+++ b/at/linux-lib.pl
@@ -1,48 +1,53 @@
 # linux-lib.pl
+use strict;
+use warnings;
+our (%config);
 
 sub list_atjobs
 {
-local @rv;
-opendir(DIR, $config{'at_dir'});
-while($f = readdir(DIR)) {
-	local $p = "$config{'at_dir'}/$f";
+my @rv;
+opendir(my $DIR, $config{'at_dir'});
+while(my $f = readdir($DIR)) {
+	my $p = "$config{'at_dir'}/$f";
 	if ($f =~ /^a(\S{5})(\S+)$/) {
-		local @st = stat($p);
-		local $job = { 'id' => hex($1),
+		my @st = stat($p);
+		my $job = { 'id' => hex($1),
 			       'date' => hex($2) * 60,
 			       'user' => scalar(getpwuid($st[4])),
 			       'created' => $st[9] };
-		open(FILE, $p);
-		while(<FILE>) {
+		open(my $FILE, "<", $p);
+		while(<$FILE>) {
 			$job->{'cmd'} .= $_;
 			}
-		close(FILE);
+		close($FILE);
 		$job->{'realcmd'} = $job->{'cmd'};
 		$job->{'realcmd'} =~ s/^[\000-\177]+cd\s+(\S+)\s+\|\|\s+{\n.*\n.*\n.*\n//;
 		$job->{'realcmd'} =~ s/\$\{SHELL:.*\n\n?//;
 		push(@rv, $job);
 		}
 	}
-closedir(DIR);
+closedir($DIR);
 return @rv;
 }
 
 # create_atjob(user, time, commands, directory, send-email)
 sub create_atjob
 {
-local @tm = localtime($_[1]);
-local $date = sprintf "%2.2d:%2.2d %d.%d.%d",
+my @tm = localtime($_[1]);
+my $date = sprintf "%2.2d:%2.2d %d.%d.%d",
 		$tm[2], $tm[1], $tm[3], $tm[4]+1, $tm[5]+1900;
-local $mailflag = $_[4] ? "-m" : "";
-local $cmd = "cd ".quotemeta($_[3])." ; at $mailflag $date";
-local @uinfo = getpwnam($_[0]);
+my $mailflag = $_[4] ? "-m" : "";
+my $cmd = "cd ".quotemeta($_[3])." ; at $mailflag $date";
+my @uinfo = getpwnam($_[0]);
 if ($uinfo[2] != $<) {
 	# Only SU if we are not already the user
 	$cmd = &command_as_user($_[0], 0, $cmd);
 	}
+no strict "subs";
 &open_execute_command(AT, "$cmd >/dev/null 2>&1", 0);
 print AT $_[2];
 close(AT);
+use strict "subs";
 &additional_log('exec', undef, $cmd);
 }