Commit 15a2ee74d22674c58f347b16b3af5601fa4e15db

Authored by Jeremy Huntwork
Committed by Sam Ravnborg
1 parent de2addf592

Fix incompatibility with versions of Perl less than 5.6.0

Fix headers_install.pl and headers_check.pl to be compatible with versions
of Perl less than 5.6.0.  It has been tested with Perl 5.005_03 and 5.8.8.
I realize this may not be an issue for most people, but there will still
be some that hit it, I imagine.  There are three basic issues:

1. Prior to 5.6.0 open() only used 2 arguments, and the versions of
the scripts in 2.6.27.1 use 3.
2. 5.6.0 also introduced the ability to use uninitialized scalar
variables as file handles, which the current scripts make use of.
3. Lastly, 5.6.0 also introduced the pragma 'use warnings'. We can use
the -w switch and be backwards compatible.

Signed-off-by: Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Showing 2 changed files with 14 additions and 13 deletions Side-by-side Diff

scripts/headers_check.pl
1   -#!/usr/bin/perl
  1 +#!/usr/bin/perl -w
2 2 #
3 3 # headers_check.pl execute a number of trivial consistency checks
4 4 #
... ... @@ -17,7 +17,6 @@
17 17 # 2) TODO: check for leaked CONFIG_ symbols
18 18  
19 19 use strict;
20   -use warnings;
21 20  
22 21 my ($dir, $arch, @files) = @ARGV;
23 22  
24 23  
25 24  
26 25  
... ... @@ -27,14 +26,15 @@
27 26 my $filename;
28 27  
29 28 foreach my $file (@files) {
  29 + local *FH;
30 30 $filename = $file;
31   - open(my $fh, '<', "$filename") or die "$filename: $!\n";
  31 + open(FH, "<$filename") or die "$filename: $!\n";
32 32 $lineno = 0;
33   - while ($line = <$fh>) {
  33 + while ($line = <FH>) {
34 34 $lineno++;
35 35 check_include();
36 36 }
37   - close $fh;
  37 + close FH;
38 38 }
39 39 exit $ret;
40 40  
scripts/headers_install.pl
1   -#!/usr/bin/perl
  1 +#!/usr/bin/perl -w
2 2 #
3 3 # headers_install prepare the listed header files for use in
4 4 # user space and copy the files to their destination.
5 5  
6 6  
7 7  
8 8  
9 9  
... ... @@ -17,28 +17,29 @@
17 17 # 3) Drop all sections defined out by __KERNEL__ (using unifdef)
18 18  
19 19 use strict;
20   -use warnings;
21 20  
22 21 my ($readdir, $installdir, $arch, @files) = @ARGV;
23 22  
24 23 my $unifdef = "scripts/unifdef -U__KERNEL__";
25 24  
26 25 foreach my $file (@files) {
  26 + local *INFILE;
  27 + local *OUTFILE;
27 28 my $tmpfile = "$installdir/$file.tmp";
28   - open(my $infile, '<', "$readdir/$file")
  29 + open(INFILE, "<$readdir/$file")
29 30 or die "$readdir/$file: $!\n";
30   - open(my $outfile, '>', "$tmpfile") or die "$tmpfile: $!\n";
31   - while (my $line = <$infile>) {
  31 + open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n";
  32 + while (my $line = <INFILE>) {
32 33 $line =~ s/([\s(])__user\s/$1/g;
33 34 $line =~ s/([\s(])__force\s/$1/g;
34 35 $line =~ s/([\s(])__iomem\s/$1/g;
35 36 $line =~ s/\s__attribute_const__\s/ /g;
36 37 $line =~ s/\s__attribute_const__$//g;
37 38 $line =~ s/^#include <linux\/compiler.h>//;
38   - printf $outfile "%s", $line;
  39 + printf OUTFILE "%s", $line;
39 40 }
40   - close $outfile;
41   - close $infile;
  41 + close OUTFILE;
  42 + close INFILE;
42 43 system $unifdef . " $tmpfile > $installdir/$file";
43 44 unlink $tmpfile;
44 45 }