gpg: Good signature from "Scott James Remnant <[EMAIL PROTECTED]>"
* added files
{arch}/dpkg/dpkg--cvs/dpkg--cvs--0/[EMAIL PROTECTED]/patch-log/patch-1086
* modified files
--- orig/ChangeLog
+++ mod/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 8 20:49:32 CDT 2002 Adam Heath <[EMAIL PROTECTED]>
+
+ * lib/tarfn.c: Fix handling of gnu longname and gnu longlink support,
+ when there is both types for the same file entry, in a tarball.
+
Sun Sep 8 20:21:27 CDT 2002 Adam Heath <[EMAIL PROTECTED]>
* lib/varbuf.[ch]: Add varbufstrftime.
--- orig/debian/changelog
+++ mod/debian/changelog
@@ -5,6 +5,8 @@
* Add Bugs and Origin tags to dpkg-scanpackages. Closes: Bug#154422
* Add support for alternative compression formats for data.tar inside
debs. This includes gzip, bzip2, and stored. Closes: #34727
+ * Fix handling of gnu longname and gnu longlink support, when there is
+ both types for the same file entry, in a tarball. Closes: #128388.
-- Wichert Akkerman <[EMAIL PROTECTED]> Sat, 22 Jun 2002 14:02:59 +0200
--- orig/lib/tarfn.c
+++ mod/lib/tarfn.c
@@ -137,16 +137,18 @@
}
break;
}
- if (next_long_name) {
- h.Name = next_long_name;
- }
+ if ( h.Type != GNU_LONGLINK && h.Type != GNU_LONGNAME ) {
+ if (next_long_name) {
+ h.Name = next_long_name;
+ }
- if (next_long_link) {
- h.LinkName = next_long_link;
- }
+ if (next_long_link) {
+ h.LinkName = next_long_link;
+ }
- next_long_name = NULL;
- next_long_link = NULL;
+ next_long_link = NULL;
+ next_long_name = NULL;
+ }
if ( h.Name[0] == '\0' ) {
errno = 0; /* Indicates broken tarfile */
