mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

Browse Source 
* 'maint' of git://repo.or.cz/git/fastimport:
  Teach import-tars about GNU tar's @LongLink extension.
This commit is contained in:
Junio C Hamano
2007-05-02 11:00:16 -07:00
parent a7da9adb1f 775477aa1d
commit 7a33b0bfce
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/fast-import/import-tars.perl
View File

@ -52,6 +52,25 @@ foreach my $tar_file (@ARGV)
Z8 Z1 Z100 Z6 Z8 Z1 Z100 Z6
Z2 Z32 Z32 Z8 Z8 Z*', $_; Z2 Z32 Z32 Z8 Z8 Z*', $_;
last unless $name; last unless $name;
if ($name eq '././@LongLink') {
# GNU tar extension
if (read(I, $_, 512) != 512) {
die ('Short archive');
}
$name = unpack 'Z257', $_;
next unless $name;
my $dummy;
if (read(I, $_, 512) != 512) {
die ('Short archive');
}
($dummy, $mode, $uid, $gid, $size, $mtime,
$chksum, $typeflag, $linkname, $magic,
$version, $uname, $gname, $devmajor, $devminor,
$prefix) = unpack 'Z100 Z8 Z8 Z8 Z12 Z12
Z8 Z1 Z100 Z6
Z2 Z32 Z32 Z8 Z8 Z*', $_;
}
next if $name =~ m{/\z}; next if $name =~ m{/\z};
$mode = oct $mode; $mode = oct $mode;
$size = oct $size; $size = oct $size;