From c9572db75add9d6673daf11a2270f29670e0eb1a Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 31 Aug 2016 14:33:24 -0600 Subject: [PATCH] use strict --- plugins/sudoers/mkdefaults | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/plugins/sudoers/mkdefaults b/plugins/sudoers/mkdefaults index a5a4edd50..654c5d8fe 100755 --- a/plugins/sudoers/mkdefaults +++ b/plugins/sudoers/mkdefaults @@ -10,6 +10,9 @@ # array of struct def_values if TYPE == T_TUPLE use warnings; +use strict; + +my ($header, $cfile, $infile); # Deal with optional -o (output) argument if ($#ARGV > 0 && $ARGV[0] eq "-o") { @@ -34,9 +37,10 @@ open(IN, "<$infile") || die "$0: can't open $infile: $!\n"; open(HEADER, ">$header") || die "$0: can't open $header: $!\n"; open(CFILE, ">$cfile") || die "$0: can't open $cfile: $!\n"; -$count = 0; -@tuple_values = ( "never" ); -@records = (); +my $count = 0; +my @tuple_values = ( "never" ); +my @records = (); +my ($var, $type, $desc, $values, $callback, $field); while () { chomp; s/\s*#.*$//; @@ -76,7 +80,7 @@ while () { } else { die "$0: syntax error near line $.\n" if $type !~ /^T_TUPLE/; $values = [ split ]; - foreach $v (@$values) { + foreach my $v (@$values) { push(@tuple_values, $v) unless grep(/^$v$/, @tuple_values); } } @@ -88,11 +92,12 @@ while () { $records[$count++] = [$var, $type, $desc, $values, $callback] if defined($var); # Print out value arrays -for ($i = 0; $i < $count; $i++) { +for (my $i = 0; $i < $count; $i++) { if (defined($records[$i]->[3])) { die "Values list specified for non-tuple\n" unless $records[$i]->[1] =~ /^T_TUPLE/; - printf CFILE "static struct def_values def_data_%s[] = {\n", $records[$i]->[0]; + printf CFILE "static struct def_values def_data_%s[] = {\n", + $records[$i]->[0]; foreach (@{$records[$i]->[3]}) { print CFILE " { \"$_\", $_ },\n"; } @@ -103,7 +108,7 @@ for ($i = 0; $i < $count; $i++) { # Print each record print CFILE "struct sudo_defs_types sudo_defs_table[] = {\n {\n"; -for ($i = 0; $i < $count; $i++) { +for (my $i = 0; $i < $count; $i++) { print_record($records[$i], $i); } print CFILE "\tNULL, 0, NULL\n }\n};\n"; @@ -111,7 +116,7 @@ print CFILE "\tNULL, 0, NULL\n }\n};\n"; # Print out def_tuple if (@tuple_values) { print HEADER "\nenum def_tuple {\n"; - for ($i = 0; $i <= $#tuple_values; $i++) { + for (my $i = 0; $i <= $#tuple_values; $i++) { printf HEADER "\t%s%s\n", $tuple_values[$i], $i != $#tuple_values ? "," : ""; } -- 2.40.0