diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2014-01-17 15:39:54 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2014-01-17 15:39:54 +0000 |
| commit | c75e3e2eebdbe09cf4d9ac18f8cda708e1e2471d (patch) | |
| tree | ea82091d56eae6d8f50b9623f86e7ba82809b88e /usr.sbin | |
| parent | be134824c24f0f92722509953c17c816133d86ba (diff) | |
"recognize" extended header thingies (we don't handle them, we just
spew more useful error messages)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Ustar.pm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Ustar.pm b/usr.sbin/pkg_add/OpenBSD/Ustar.pm index f95ce49dde6..2877cd20da4 100644 --- a/usr.sbin/pkg_add/OpenBSD/Ustar.pm +++ b/usr.sbin/pkg_add/OpenBSD/Ustar.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Ustar.pm,v 1.76 2014/01/13 18:42:34 espie Exp $ +# $OpenBSD: Ustar.pm,v 1.77 2014/01/17 15:39:53 espie Exp $ # # Copyright (c) 2002-2014 Marc Espie <espie@openbsd.org> # @@ -37,7 +37,12 @@ use constant { MAXLINKNAME => 100, MAXPREFIX => 155, MAXUSERNAME => 32, - MAXGROUPNAME => 32 + MAXGROUPNAME => 32, + # XXX those are NOT supported, just recognized + XHDR => 'x', + GHDR => 'g', + LONGLINK => 'K', + LONGNAME => 'L', }; use File::Basename (); @@ -121,6 +126,13 @@ my $types = { BLOCKDEVICE , 'OpenBSD::Ustar::BlockDevice', }; +my $unsupported = { + XHDR => 'Extended header', + GHDR => 'GNU header', + LONGLINK => 'Long symlink', + LONGNAME => 'Long file', +}; + sub next { my $self = shift; @@ -187,7 +199,8 @@ sub next if (defined $types->{$type}) { $self->new_object($result, $types->{$type}); } else { - $self->fatal("Unsupported type #1", $type); + $self->fatal("Unsupported type #1 (#2)", $type, + $unsupported->{$type} // "unknown"); } if (!$result->isFile && $result->{size} != 0) { $self->fatal("Bad archive: non null size for #1 (#2)", |