*** zipfile.py Wed Jan 15 05:51:06 2003
--- zipfilenew.py Tue Jun 17 10:19:46 2003
***************
*** 1,6 ****
  "Read and write ZIP files."
- # Written by James C. Ahlstrom jim@interet.com
- # All rights transferred to CNRI pursuant to the Python contribution agreement
  
  import struct, os, time
  import binascii
--- 1,4 ----
***************
*** 116,122 ****
      """Class with attributes describing each file in the ZIP archive."""
  
      def __init__(self, filename="NoName", date_time=(1980,1,1,0,0,0)):
!         self.filename = _normpath(filename) # Name of the file in the archive
          self.date_time = date_time      # year, month, day, hour, min, sec
          # Standard values:
          self.compress_type = ZIP_STORED # Type of compression for the file
--- 114,132 ----
      """Class with attributes describing each file in the ZIP archive."""
  
      def __init__(self, filename="NoName", date_time=(1980,1,1,0,0,0)):
!         self.orig_filename = filename   # Original file name in archive
! # Terminate the file name at the first null byte.  Null bytes in file
! # names are used as tricks by viruses in archives.
!         null_byte = filename.find(chr(0))
!         if null_byte >= 0:
!             filename = filename[0:null_byte]
!             print "File name %s contains a suspicious null byte!" % filename
! # This is used to ensure paths in generated ZIP files always use
! # forward slashes as the directory separator, as required by the
! # ZIP format specification.
!         if os.sep != "/":
!             filename = filename.replace(os.sep, "/")
!         self.filename = filename        # Normalized file name
          self.date_time = date_time      # year, month, day, hour, min, sec
          # Standard values:
          self.compress_type = ZIP_STORED # Type of compression for the file
***************
*** 157,173 ****
          return header + self.filename + self.extra
  
  
- # This is used to ensure paths in generated ZIP files always use
- # forward slashes as the directory separator, as required by the
- # ZIP format specification.
- if os.sep != "/":
-     def _normpath(path):
-         return path.replace(os.sep, "/")
- else:
-     def _normpath(path):
-         return path
- 
- 
  class ZipFile:
      """ Class with methods to open, read, write, close, list zip files.
  
--- 167,172 ----
***************
*** 300,309 ****
                                  + fheader[_FH_FILENAME_LENGTH]
                                  + fheader[_FH_EXTRA_FIELD_LENGTH])
              fname = fp.read(fheader[_FH_FILENAME_LENGTH])
!             if fname != data.filename:
                  raise RuntimeError, \
                        'File name in directory "%s" and header "%s" differ.' % (
!                           data.filename, fname)
  
      def namelist(self):
          """Return a list of file names in the archive."""
--- 299,308 ----
                                  + fheader[_FH_FILENAME_LENGTH]
                                  + fheader[_FH_EXTRA_FIELD_LENGTH])
              fname = fp.read(fheader[_FH_FILENAME_LENGTH])
!             if fname != data.orig_filename:
                  raise RuntimeError, \
                        'File name in directory "%s" and header "%s" differ.' % (
!                           data.orig_filename, fname)
  
      def namelist(self):
          """Return a list of file names in the archive."""