lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Integrate hash into instantiated descriptor file names.

Browse source 
* Use MD5::Digest.
This commit is contained in:
Eelco Dolstra 2003-03-25 11:39:51 +00:00
parent 73c53935d0
commit 3f1a1457e9
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/nix-instantiate.in
View file

@ -3,6 +3,7 @@
use strict; use strict;
use FileHandle; use FileHandle;
use File::Spec; use File::Spec;
use Digest::MD5;
my $system = "@SYSTEM@"; my $system = "@SYSTEM@";
@ -34,6 +35,15 @@ sub fetchFile {
} }
} }
sub hashFile {
my $file = shift;
open FILE, "< $file" or die "cannot open $file";
# !!! error checking
my $hash = Digest::MD5->new->addfile(*FILE)->hexdigest;
close FILE;
return $hash;
}
sub convert { sub convert {
my $descr = shift; my $descr = shift;
@ -47,9 +57,9 @@ sub convert {
my $IN = new FileHandle; my $IN = new FileHandle;
my $OUT = new FileHandle; my $OUT = new FileHandle;
my $outfile = "$outdir/$fn"; my $tmpfile = "$outdir/$fn-tmp";
open $IN, "< $descr" or die "cannot open $descr"; open $IN, "< $descr" or die "cannot open $descr";
open $OUT, "> $outfile" or die "cannot create $outfile"; open $OUT, "> $tmpfile" or die "cannot create $tmpfile";
print $OUT "system : $system\n"; print $OUT "system : $system\n";
@ -60,26 +70,28 @@ sub convert {
my ($name, $loc) = ($1, $2); my ($name, $loc) = ($1, $2);
my $file = fetchFile($loc); my $file = fetchFile($loc);
$file = File::Spec->rel2abs($file, $dir); $file = File::Spec->rel2abs($file, $dir);
my $out = `md5sum $file`; my $hash = hashFile($file);
die unless ($? == 0);
$out =~ /^([0-9a-f]+)\s/;
my $hash = $1;
print $OUT "$name = $hash\n"; print $OUT "$name = $hash\n";
} elsif (/^(\w+)\s*<-\s*([+\w\d\.\/-]+)\s*(\#.*)?$/) { } elsif (/^(\w+)\s*<-\s*([+\w\d\.\/-]+)\s*(\#.*)?$/) {
my $name = $1; my $name = $1;
my $file = $2; my $file = $2;
$file = File::Spec->rel2abs($file, $dir); $file = File::Spec->rel2abs($file, $dir);
$file = convert($file); $file = convert($file);
my $out = `md5sum $file`; my $hash = hashFile($file);
die unless ($? == 0);
$out =~ /^([0-9a-f]+)\s/;
my $hash = $1;
print $OUT "$name <- $hash\n"; print $OUT "$name <- $hash\n";
} else { } else {
print $OUT "$_\n"; print $OUT "$_\n";
} }
} }
close $OUT;
close $IN;
my $hash = hashFile($tmpfile);
my $outfile = "$outdir/$hash-$fn";
rename($tmpfile, $outfile) or die "cannot rename $tmpfile to $outfile";
$donetmpls{$descr} = $outfile; $donetmpls{$descr} = $outfile;
return $outfile; return $outfile;
} }