diffoscope 323__tar.gz → 325__tar.gz

{diffoscope-323/diffoscope.egg-info → diffoscope-325}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffoscope
-Version: 323
+Version: 325
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-323 → diffoscope-325}/diffoscope/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "323"
+VERSION = "325"

{diffoscope-323 → diffoscope-325}/diffoscope/comparators/gzip.py

@@ -48,11 +48,19 @@ class GzipContainer(Archive):
             # Use the short options (-d and -c) instead of the long options
             # (--decompress and --stdout) to support the gzip implementation
             # present in busybox, which doesn't support the long options.
-            subprocess.check_call(
+            returncode = subprocess.call(
                 ["gzip", "-d", "-c", self.source.path],
                 stdout=fp,
                 stderr=None,
             )
+        # gzip exits with 2 (a warning) when decompression succeeds but there
+        # is trailing garbage after the stream, eg. metadata appended to
+        # OpenWrt firmware images. The payload is still fully decompressed, so
+        # only treat a fatal error (exit code 1) as a failure.
+        if returncode not in (0, 2):
+            raise subprocess.CalledProcessError(
+                returncode, ["gzip", "-d", "-c", self.source.path]
+            )
         return dest_path
 
 

{diffoscope-323 → diffoscope-325/diffoscope.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffoscope
-Version: 323
+Version: 325
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-323 → diffoscope-325}/tests/comparators/test_epub.py

@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2016-2017, 2020-2024 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2017, 2020-2024, 2026 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ def differences(epub1, epub2):
 
 
 @skip_unless_tools_exist("zipinfo", "zipdetails")
-@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.008")
 def test_differences(differences):
     assert differences[0].source1 == "zipinfo {}"
     assert differences[0].source2 == "zipinfo {}"

{diffoscope-323 → diffoscope-325}/tests/comparators/test_gzip.py

@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
+import gzip
 import shutil
 import pytest
 
@@ -90,6 +91,28 @@ def test_content_diff(differences):
     assert differences[1].unified_diff == expected_diff
 
 
+def test_trailing_garbage(tmpdir):
+    # OpenWrt firmware images append metadata after the gzip stream, which
+    # makes gzip(1) exit with a warning (code 2) even though the payload
+    # decompressed fine. Ensure we still compare the content.
+    def make(name, content):
+        path = str(tmpdir.join(name))
+        with gzip.open(path, "wb") as fp:
+            fp.write(content)
+        with open(path, "ab") as fp:
+            fp.write(b"OpenWrt appended metadata blob")
+        return specialize(FilesystemFile(path))
+
+    file1 = make("garbage1.gz", b"hello\n")
+    file2 = make("garbage2.gz", b"world\n")
+
+    assert file1.compare(file1) is None
+    difference = file1.compare(file2)
+    assert difference is not None
+    # The decompressed content must have been extracted and compared.
+    assert difference.details[-1].unified_diff
+
+
 def test_compare_non_existing(monkeypatch, gzip1):
     monkeypatch.setattr(Config(), "new_file", True)
     difference = gzip1.compare(MissingFile("/nonexisting", gzip1))

{diffoscope-323 → diffoscope-325}/tests/comparators/test_zip.py

@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2020, 2022, 2024-2025 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2020, 2022, 2024-2026 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -81,7 +81,7 @@ def differences2(zip1, zip3):
 
 
 @skip_unless_tools_exist("zipinfo", "zipdetails")
-@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.008")
 @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
 def test_metadata(differences):
     assert_diff(differences[0], "zip_zipinfo_expected_diff")
@@ -96,7 +96,7 @@ def test_compressed_files(differences):
 
 
 @skip_unless_tools_exist("zipinfo", "bsdtar", "zipdetails")
-@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.006")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.008")
 @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
 def test_extra_fields(differences2):
     assert_diff(differences2[0], "zip_bsdtar_expected_diff")
@@ -189,7 +189,8 @@ def jmod_differences(jmod1, jmod2):
     return jmod1.compare(jmod2).details
 
 
-@skip_unless_tools_exist("zipinfo", "zipdetails", "zipnote")
+@skip_unless_tools_exist("zipinfo", "zipnote")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.008")
 @skip_unless_tool_is_at_least("perl", io_compress_zip_version, "2.212")
 def test_jmod_metadata(jmod_differences, jmod1, jmod2):
     assert jmod_differences[0].source1 == "zipinfo {}"
@@ -210,7 +211,7 @@ def comment_differences(test_comment1, test_comment2):
 
 
 @skip_unless_tools_exist("zipnote", "zipdetails")
-@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.004")
+@skip_unless_tool_is_at_least("zipdetails", zipdetails_version, "4.008")
 def test_commented(comment_differences):
     assert_diff(comment_differences[1], "comment_zipinfo_expected_diff")
     assert_diff(comment_differences[2], "comment_zipdetails_expected_diff")

{diffoscope-323 → diffoscope-325}/tests/data/comment_zipdetails_expected_diff

@@ -1,4 +1,4 @@
-@@ -37,15 +37,15 @@
+@@ -33,15 +33,15 @@
  0047 Compression Method    0000 (0) 'Stored'
  0049 Modification Time     4D869485 (1300665477) 'Thu Dec  6 18:36:10 2018'
  004D CRC                   00000000 (0)
@@ -15,7 +15,7 @@
       [Bits 16-24]          01A4 (420) 'Unix attrib: rw-r--r--'
       [Bits 28-31]          08 (8) 'Regular File'
  0067 Local Header Offset   00000000 (0)
-@@ -61,20 +61,22 @@
+@@ -53,18 +53,20 @@
  0077 Extra ID #2           7875 (30837) 'Unix Extra type 3 [ux]'
  0079   Length              000B (11)
  007B   Version             01 (1)
@@ -42,7 +42,5 @@
 +009B Offset to Central Dir 0000003D (61)
 +009F Comment Length        0007 (7)
 +00A1 Comment               'XXXXXXX'
- #
- # Warning Count: 2
  #
  # Done

{diffoscope-323 → diffoscope-325}/tests/data/epub_expected_diffs

@@ -38,8 +38,8 @@
  001A Filename Length       0008 (8)
  001C Extra Length          0000 (0)
  001E Filename              'XXXXXXXX'
- #
-@@ -21,15 +21,15 @@
+ 0026 PAYLOAD               XXXXXXXXXXXXXXXXXXXX
+@@ -17,15 +17,15 @@
  003A LOCAL HEADER #2       04034B50 (67324752)
  003E Extract Zip Spec      14 (20) '2.0'
  003F Extract OS            00 (0) 'MS-DOS'
@@ -55,8 +55,8 @@
  0054 Filename Length       0016 (22)
  0056 Extra Length          0000 (0)
  0058 Filename              'XXXXXXXXXXXXXXXXXXXXXX'
- #
-@@ -42,15 +42,15 @@
+ 006E PAYLOAD               XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+@@ -34,15 +34,15 @@
  0114 LOCAL HEADER #3       04034B50 (67324752)
  0118 Extract Zip Spec      14 (20) '2.0'
  0119 Extract OS            00 (0) 'MS-DOS'
@@ -72,8 +72,8 @@
  012E Filename Length       002D (45)
  0130 Extra Length          0000 (0)
  0132 Filename              'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
- #
-@@ -62,15 +62,15 @@
+ 015F PAYLOAD               XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+@@ -50,15 +50,15 @@
  01D6 LOCAL HEADER #4       04034B50 (67324752)
  01DA Extract Zip Spec      14 (20) '2.0'
  01DB Extract OS            00 (0) 'MS-DOS'
@@ -89,8 +89,8 @@
  01F0 Filename Length       000E (14)
  01F2 Extra Length          0000 (0)
  01F4 Filename              'XXXXXXXXXXXXXX'
- #
-@@ -83,15 +83,15 @@
+ 0202 PAYLOAD               XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+@@ -67,15 +67,15 @@
  02DF LOCAL HEADER #5       04034B50 (67324752)
  02E3 Extract Zip Spec      14 (20) '2.0'
  02E4 Extract OS            00 (0) 'MS-DOS'
@@ -106,8 +106,8 @@
  02F9 Filename Length       0010 (16)
  02FB Extra Length          0000 (0)
  02FD Filename              'XXXXXXXXXXXXXXXX'
- #
-@@ -103,334 +103,334 @@
+ 030D PAYLOAD
+@@ -83,280 +83,280 @@
  043B LOCAL HEADER #6       04034B50 (67324752)
  043F Extract Zip Spec      14 (20) '2.0'
  0440 Extract OS            00 (0) 'MS-DOS'
@@ -125,10 +125,6 @@
  0455 Filename Length       000B (11)
  0457 Extra Length          0000 (0)
  0459 Filename              'XXXXXXXXXXX'
- #
- # WARNING: Offset 0x459: Filename 'XXXXXXXXXXX'
- #          Zero length filename
- #
  0464 PAYLOAD
  
 -0640 LOCAL HEADER #7       04034B50 (67324752)
@@ -145,10 +141,6 @@
 -065A Filename Length       0007 (7)
 -065C Extra Length          0000 (0)
 -065E Filename              'XXXXXXX'
--#
--# WARNING: Offset 0x65E: Filename 'XXXXXXX'
--#          Zero length filename
--#
 -0665 PAYLOAD
 -
 -07A3 LOCAL HEADER #8       04034B50 (67324752)
@@ -165,10 +157,6 @@
 -07BD Filename Length       0009 (9)
 -07BF Extra Length          0000 (0)
 -07C1 Filename              'XXXXXXXXX'
--#
--# WARNING: Offset 0x7C1: Filename 'XXXXXXXXX'
--#          Zero length filename
--#
 -07CA PAYLOAD
 -
 -0929 LOCAL HEADER #9       04034B50 (67324752)
@@ -185,10 +173,6 @@
 -0943 Filename Length       000B (11)
 -0945 Extra Length          0000 (0)
 -0947 Filename              'XXXXXXXXXXX'
--#
--# WARNING: Offset 0x947: Filename 'XXXXXXXXXXX'
--#          Zero length filename
--#
 -0952 PAYLOAD
 -
 -0AB5 CENTRAL HEADER #1     02014B50 (33639248)
@@ -222,10 +206,6 @@
 +0659 Filename Length       0007 (7)
 +065B Extra Length          0000 (0)
 +065D Filename              'XXXXXXX'
-+#
-+# WARNING: Offset 0x65D: Filename 'XXXXXXX'
-+#          Zero length filename
-+#
 +0664 PAYLOAD
 +
 +07A0 LOCAL HEADER #8       04034B50 (67324752)
@@ -242,10 +222,6 @@
 +07BA Filename Length       0009 (9)
 +07BC Extra Length          0000 (0)
 +07BE Filename              'XXXXXXXXX'
-+#
-+# WARNING: Offset 0x7BE: Filename 'XXXXXXXXX'
-+#          Zero length filename
-+#
 +07C7 PAYLOAD
 +
 +0926 LOCAL HEADER #9       04034B50 (67324752)
@@ -262,10 +238,6 @@
 +0940 Filename Length       000B (11)
 +0942 Extra Length          0000 (0)
 +0944 Filename              'XXXXXXXXXXX'
-+#
-+# WARNING: Offset 0x944: Filename 'XXXXXXXXXXX'
-+#          Zero length filename
-+#
 +094F PAYLOAD
 +
 +0AB2 CENTRAL HEADER #1     02014B50 (33639248)
@@ -289,16 +261,7 @@
 -0ADB Ext File Attributes   00000000 (0)
 -0ADF Local Header Offset   00000000 (0)
 -0AE3 Filename              'XXXXXXXX'
--#
--# WARNING: Offset 0xAE3: Filename 'XXXXXXXX'
-+0AD8 Ext File Attributes   00000000 (0)
-+0ADC Local Header Offset   00000000 (0)
-+0AE0 Filename              'XXXXXXXX'
-+#
-+# WARNING: Offset 0xAE0: Filename 'XXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0AEB CENTRAL HEADER #2     02014B50 (33639248)
 -0AEF Created Zip Spec      00 (0) '0.0'
 -0AF0 Created OS            00 (0) 'MS-DOS'
@@ -317,6 +280,10 @@
 -0B0B Comment Length        0000 (0)
 -0B0D Disk Start            0000 (0)
 -0B0F Int File Attributes   0000 (0)
++0AD8 Ext File Attributes   00000000 (0)
++0ADC Local Header Offset   00000000 (0)
++0AE0 Filename              'XXXXXXXX'
++
 +0AE8 CENTRAL HEADER #2     02014B50 (33639248)
 +0AEC Created Zip Spec      00 (0) '0.0'
 +0AED Created OS            00 (0) 'MS-DOS'
@@ -339,16 +306,7 @@
 -0B11 Ext File Attributes   00000000 (0)
 -0B15 Local Header Offset   0000003A (58)
 -0B19 Filename              'XXXXXXXXXXXXXXXXXXXXXX'
--#
--# WARNING: Offset 0xB19: Filename 'XXXXXXXXXXXXXXXXXXXXXX'
-+0B0E Ext File Attributes   00000000 (0)
-+0B12 Local Header Offset   0000003A (58)
-+0B16 Filename              'XXXXXXXXXXXXXXXXXXXXXX'
-+#
-+# WARNING: Offset 0xB16: Filename 'XXXXXXXXXXXXXXXXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0B2F CENTRAL HEADER #3     02014B50 (33639248)
 -0B33 Created Zip Spec      00 (0) '0.0'
 -0B34 Created OS            00 (0) 'MS-DOS'
@@ -367,6 +325,10 @@
 -0B4F Comment Length        0000 (0)
 -0B51 Disk Start            0000 (0)
 -0B53 Int File Attributes   0000 (0)
++0B0E Ext File Attributes   00000000 (0)
++0B12 Local Header Offset   0000003A (58)
++0B16 Filename              'XXXXXXXXXXXXXXXXXXXXXX'
++
 +0B2C CENTRAL HEADER #3     02014B50 (33639248)
 +0B30 Created Zip Spec      00 (0) '0.0'
 +0B31 Created OS            00 (0) 'MS-DOS'
@@ -389,16 +351,7 @@
 -0B55 Ext File Attributes   00000000 (0)
 -0B59 Local Header Offset   00000114 (276)
 -0B5D Filename              'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
--#
--# WARNING: Offset 0xB5D: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-+0B52 Ext File Attributes   00000000 (0)
-+0B56 Local Header Offset   00000114 (276)
-+0B5A Filename              'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-+#
-+# WARNING: Offset 0xB5A: Filename 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0B8A CENTRAL HEADER #4     02014B50 (33639248)
 -0B8E Created Zip Spec      00 (0) '0.0'
 -0B8F Created OS            00 (0) 'MS-DOS'
@@ -417,6 +370,10 @@
 -0BAA Comment Length        0000 (0)
 -0BAC Disk Start            0000 (0)
 -0BAE Int File Attributes   0000 (0)
++0B52 Ext File Attributes   00000000 (0)
++0B56 Local Header Offset   00000114 (276)
++0B5A Filename              'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
++
 +0B87 CENTRAL HEADER #4     02014B50 (33639248)
 +0B8B Created Zip Spec      00 (0) '0.0'
 +0B8C Created OS            00 (0) 'MS-DOS'
@@ -439,16 +396,7 @@
 -0BB0 Ext File Attributes   00000000 (0)
 -0BB4 Local Header Offset   000001D6 (470)
 -0BB8 Filename              'XXXXXXXXXXXXXX'
--#
--# WARNING: Offset 0xBB8: Filename 'XXXXXXXXXXXXXX'
-+0BAD Ext File Attributes   00000000 (0)
-+0BB1 Local Header Offset   000001D6 (470)
-+0BB5 Filename              'XXXXXXXXXXXXXX'
-+#
-+# WARNING: Offset 0xBB5: Filename 'XXXXXXXXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0BC6 CENTRAL HEADER #5     02014B50 (33639248)
 -0BCA Created Zip Spec      00 (0) '0.0'
 -0BCB Created OS            00 (0) 'MS-DOS'
@@ -467,6 +415,10 @@
 -0BE6 Comment Length        0000 (0)
 -0BE8 Disk Start            0000 (0)
 -0BEA Int File Attributes   0000 (0)
++0BAD Ext File Attributes   00000000 (0)
++0BB1 Local Header Offset   000001D6 (470)
++0BB5 Filename              'XXXXXXXXXXXXXX'
++
 +0BC3 CENTRAL HEADER #5     02014B50 (33639248)
 +0BC7 Created Zip Spec      00 (0) '0.0'
 +0BC8 Created OS            00 (0) 'MS-DOS'
@@ -489,16 +441,7 @@
 -0BEC Ext File Attributes   00000000 (0)
 -0BF0 Local Header Offset   000002DF (735)
 -0BF4 Filename              'XXXXXXXXXXXXXXXX'
--#
--# WARNING: Offset 0xBF4: Filename 'XXXXXXXXXXXXXXXX'
-+0BE9 Ext File Attributes   00000000 (0)
-+0BED Local Header Offset   000002DF (735)
-+0BF1 Filename              'XXXXXXXXXXXXXXXX'
-+#
-+# WARNING: Offset 0xBF1: Filename 'XXXXXXXXXXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0C04 CENTRAL HEADER #6     02014B50 (33639248)
 -0C08 Created Zip Spec      00 (0) '0.0'
 -0C09 Created OS            00 (0) 'MS-DOS'
@@ -517,6 +460,10 @@
 -0C24 Comment Length        0000 (0)
 -0C26 Disk Start            0000 (0)
 -0C28 Int File Attributes   0000 (0)
++0BE9 Ext File Attributes   00000000 (0)
++0BED Local Header Offset   000002DF (735)
++0BF1 Filename              'XXXXXXXXXXXXXXXX'
++
 +0C01 CENTRAL HEADER #6     02014B50 (33639248)
 +0C05 Created Zip Spec      00 (0) '0.0'
 +0C06 Created OS            00 (0) 'MS-DOS'
@@ -539,16 +486,7 @@
 -0C2A Ext File Attributes   00000000 (0)
 -0C2E Local Header Offset   0000043B (1083)
 -0C32 Filename              'XXXXXXXXXXX'
--#
--# WARNING: Offset 0xC32: Filename 'XXXXXXXXXXX'
-+0C27 Ext File Attributes   00000000 (0)
-+0C2B Local Header Offset   0000043B (1083)
-+0C2F Filename              'XXXXXXXXXXX'
-+#
-+# WARNING: Offset 0xC2F: Filename 'XXXXXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0C3D CENTRAL HEADER #7     02014B50 (33639248)
 -0C41 Created Zip Spec      00 (0) '0.0'
 -0C42 Created OS            00 (0) 'MS-DOS'
@@ -567,6 +505,10 @@
 -0C5D Comment Length        0000 (0)
 -0C5F Disk Start            0000 (0)
 -0C61 Int File Attributes   0000 (0)
++0C27 Ext File Attributes   00000000 (0)
++0C2B Local Header Offset   0000043B (1083)
++0C2F Filename              'XXXXXXXXXXX'
++
 +0C3A CENTRAL HEADER #7     02014B50 (33639248)
 +0C3E Created Zip Spec      00 (0) '0.0'
 +0C3F Created OS            00 (0) 'MS-DOS'
@@ -589,16 +531,7 @@
 -0C63 Ext File Attributes   00000000 (0)
 -0C67 Local Header Offset   00000640 (1600)
 -0C6B Filename              'XXXXXXX'
--#
--# WARNING: Offset 0xC6B: Filename 'XXXXXXX'
-+0C60 Ext File Attributes   00000000 (0)
-+0C64 Local Header Offset   0000063F (1599)
-+0C68 Filename              'XXXXXXX'
-+#
-+# WARNING: Offset 0xC68: Filename 'XXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0C72 CENTRAL HEADER #8     02014B50 (33639248)
 -0C76 Created Zip Spec      00 (0) '0.0'
 -0C77 Created OS            00 (0) 'MS-DOS'
@@ -617,6 +550,10 @@
 -0C92 Comment Length        0000 (0)
 -0C94 Disk Start            0000 (0)
 -0C96 Int File Attributes   0000 (0)
++0C60 Ext File Attributes   00000000 (0)
++0C64 Local Header Offset   0000063F (1599)
++0C68 Filename              'XXXXXXX'
++
 +0C6F CENTRAL HEADER #8     02014B50 (33639248)
 +0C73 Created Zip Spec      00 (0) '0.0'
 +0C74 Created OS            00 (0) 'MS-DOS'
@@ -639,16 +576,7 @@
 -0C98 Ext File Attributes   00000000 (0)
 -0C9C Local Header Offset   000007A3 (1955)
 -0CA0 Filename              'XXXXXXXXX'
--#
--# WARNING: Offset 0xCA0: Filename 'XXXXXXXXX'
-+0C95 Ext File Attributes   00000000 (0)
-+0C99 Local Header Offset   000007A0 (1952)
-+0C9D Filename              'XXXXXXXXX'
-+#
-+# WARNING: Offset 0xC9D: Filename 'XXXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0CA9 CENTRAL HEADER #9     02014B50 (33639248)
 -0CAD Created Zip Spec      00 (0) '0.0'
 -0CAE Created OS            00 (0) 'MS-DOS'
@@ -667,6 +595,10 @@
 -0CC9 Comment Length        0000 (0)
 -0CCB Disk Start            0000 (0)
 -0CCD Int File Attributes   0000 (0)
++0C95 Ext File Attributes   00000000 (0)
++0C99 Local Header Offset   000007A0 (1952)
++0C9D Filename              'XXXXXXXXX'
++
 +0CA6 CENTRAL HEADER #9     02014B50 (33639248)
 +0CAA Created Zip Spec      00 (0) '0.0'
 +0CAB Created OS            00 (0) 'MS-DOS'
@@ -689,16 +621,7 @@
 -0CCF Ext File Attributes   00000000 (0)
 -0CD3 Local Header Offset   00000929 (2345)
 -0CD7 Filename              'XXXXXXXXXXX'
--#
--# WARNING: Offset 0xCD7: Filename 'XXXXXXXXXXX'
-+0CCC Ext File Attributes   00000000 (0)
-+0CD0 Local Header Offset   00000926 (2342)
-+0CD4 Filename              'XXXXXXXXXXX'
-+#
-+# WARNING: Offset 0xCD4: Filename 'XXXXXXXXXXX'
- #          Zero length filename
- #
- 
+-
 -0CE2 END CENTRAL HEADER    06054B50 (101010256)
 -0CE6 Number of this disk   0000 (0)
 -0CE8 Central Dir Disk no   0000 (0)
@@ -707,6 +630,10 @@
 -0CEE Size of Central Dir   0000022D (557)
 -0CF2 Offset to Central Dir 00000AB5 (2741)
 -0CF6 Comment Length        0000 (0)
++0CCC Ext File Attributes   00000000 (0)
++0CD0 Local Header Offset   00000926 (2342)
++0CD4 Filename              'XXXXXXXXXXX'
++
 +0CDF END CENTRAL HEADER    06054B50 (101010256)
 +0CE3 Number of this disk   0000 (0)
 +0CE5 Central Dir Disk no   0000 (0)
@@ -715,8 +642,6 @@
 +0CEB Size of Central Dir   0000022D (557)
 +0CEF Offset to Central Dir 00000AB2 (2738)
 +0CF3 Comment Length        0000 (0)
- #
- # Warning Count: 18
  #
  # Done