Conservancy/gpl-compliance-tools
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch some of the temporary file operations to use File::Temp()

Browse source
This commit is contained in:
Bradley M. Kuhn 2012-04-15 11:01:01 -04:00
parent df4e0f2f0e
commit 232072ed9e
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
hierarchy-comparison
View file

@ -1,7 +1,7 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
# hierarchy-comparison -*- Perl -*- # hierarchy-comparison -*- Perl -*-
# Possible bug: only -type f and -type d are checked # Possible bug: only -type f and -type d are checked
# Copyright (C) 2001, 2002, 2003, 2004, 2008, 2011 Bradley M. Kuhn <bkuhn@ebb.org> # Copyright (C) 2001, 2002, 2003, 2004, 2008, 2011, 2012 Bradley M. Kuhn <bkuhn@ebb.org>
# Copyright (C) 2011 Denver Gingerich <denver@ossguy.com> # Copyright (C) 2011 Denver Gingerich <denver@ossguy.com>
# #
# This software's license gives you freedom; you can copy, convey, # This software's license gives you freedom; you can copy, convey,
@ -22,17 +22,16 @@
use strict; use strict;
use POSIX qw(tmpnam); use File::Temp qw/tempfile/;
use Cwd; use Cwd;
my $VERSION = '1.1'; my $VERSION = '1.1';
my $DO_DIFF = 1; my $DO_DIFF = 1;
###################################################################### ######################################################################
sub FindAndSortOutput { sub FindAndSortOutput ($$$$$) {
my($type, $dir, $outputFH, $ignoreRegex, $filterRewrite) = @_;
use File::Find; use File::Find;
my($type, $dir, $output, $ignoreRegex, $filterRewrite) = @_;
my @files; my @files;
my $buildList = sub { my $buildList = sub {
@ -42,8 +41,8 @@ sub FindAndSortOutput {
if ($type eq "NON-REGULAR") { if ($type eq "NON-REGULAR") {
push(@files, $val) unless -f $_; push(@files, $val) unless -f $_;
} elsif ($type eq "FILES") { } elsif ($type eq "FILES") {
push(@files, $val) if -f $_; push(@files, $val) if -f $_;
} elsif ($type eq "DIRECTORY") { } elsif ($type eq "DIRECTORY") {
push(@files, $val) if -d $_; push(@files, $val) if -d $_;
} else { } else {
die "Unknown type requested: $type"; die "Unknown type requested: $type";
@ -52,19 +51,17 @@ sub FindAndSortOutput {
find({ wanted => $buildList, no_chdir => 1}, $dir); find({ wanted => $buildList, no_chdir => 1}, $dir);
open(FILE_OUTPUT, ">$output") or
die "$0: unable to open temporary output file, $output: $!";
my @sortedChompedFiles; my @sortedChompedFiles;
foreach my $file (sort {$a cmp $b } @files) { foreach my $file (sort {$a cmp $b } @files) {
chomp $file; chomp $file;
next if defined $ignoreRegex and $file =~ /$ignoreRegex/; next if defined $ignoreRegex and $file =~ /$ignoreRegex/;
push(@sortedChompedFiles, $file); push(@sortedChompedFiles, $file);
print FILE_OUTPUT "$file\n"; $outputFH->print("$file\n");
} }
close FILE_OUTPUT; $? = 0;
die "unable to write to output file: $output: $! ($?)" $outputFH->close();
if $? != 0 and defined $output; die "unable to write to output file: $outputFH: $! ($?)"
if $? != 0 and defined $outputFH;
return @sortedChompedFiles; return @sortedChompedFiles;
} }
@ -112,17 +109,19 @@ my($origDir, $comparedDir, $diffOutputFile, $ignoreRegex) = @ARGV;
$origDir =~ s%/\s*$%%; $origDir =~ s%/\s*$%%;
$comparedDir =~ s%/\s*$%%; $comparedDir =~ s%/\s*$%%;
my $origTempFile = POSIX::tmpnam(); my $origTempFH = File::Temp->new(UNLINK => 0, SUFFIX => '.orig');
my $comparedTempFile = POSIX::tmpnam(); my $origTempFile = $origTempFH->filename;
my $comparedTempFH = File::Temp->new(UNLINK => 0, SUFFIX => '.compared');
my $comparedTempFile = $comparedTempFH->filename;
# First, look for directory differences # First, look for directory differences
print "Doing directory comparison: "; print "Doing directory comparison: ";
my(@orgNonRegular) = FindAndSortOutput("NON-REGULAR", $origDir, $origTempFile, my(@orgNonRegular) = FindAndSortOutput("NON-REGULAR", $origDir, $origTempFH,
$ignoreRegex, "^/?($origDir|$comparedDir)/?"); $ignoreRegex, "^/?($origDir|$comparedDir)/?");
my(@comparedNonRegular) = FindAndSortOutput("NON-REGULAR", $comparedDir, my(@comparedNonRegular) = FindAndSortOutput("NON-REGULAR", $comparedDir,
$comparedTempFile, $ignoreRegex, $comparedTempFH, $ignoreRegex,
"^/?($origDir|$comparedDir)/?"); "^/?($origDir|$comparedDir)/?");
# TODO: use the right Perl mechanism instead of /bin/echo (ossguy) # TODO: use the right Perl mechanism instead of /bin/echo (ossguy)
@ -147,10 +146,15 @@ if ($diffExitCode == 2) {
print "Doing file hierarchy comparison: "; print "Doing file hierarchy comparison: ";
my(@orgFiles) = FindAndSortOutput("FILES", $origDir, $origTempFile, $origTempFH = File::Temp->new(UNLINK => 0, SUFFIX => '.orig');
$origTempFile = $origTempFH->filename;
$comparedTempFH = File::Temp->new(UNLINK => 0, SUFFIX => '.compared');
$comparedTempFile = $comparedTempFH->filename;
my(@orgFiles) = FindAndSortOutput("FILES", $origDir, $origTempFH,
$ignoreRegex, "^/?($origDir|$comparedDir)/?"); $ignoreRegex, "^/?($origDir|$comparedDir)/?");
my(@comparedFiles) = FindAndSortOutput("FILES", $comparedDir, my(@comparedFiles) = FindAndSortOutput("FILES", $comparedDir,
$comparedTempFile, $ignoreRegex, "^/?($origDir|$comparedDir)/?"); $comparedTempFH, $ignoreRegex, "^/?($origDir|$comparedDir)/?");
# TODO: use the right Perl mechanism instead of /bin/echo (ossguy) # TODO: use the right Perl mechanism instead of /bin/echo (ossguy)
system("/bin/echo >> $diffOutputFile 2>&1"); system("/bin/echo >> $diffOutputFile 2>&1");