*** kzip.cpp.ORG	2007-11-16 23:21:17.747000000 +0900
--- kzip.cpp	2007-11-16 23:21:17.737000000 +0900
***************
*** 954,961 ****
--- 954,966 ----
          buffer[ 26 ] = char(mysize >> 16);
          buffer[ 27 ] = char(mysize >> 24);
  
+ #ifndef	ORIGINAL_CODE
+         buffer[ 28 ] = char(path.length()); // filename length
+         buffer[ 29 ] = char(path.length() >> 8);
+ #else
          buffer[ 28 ] = char(it.current()->path().length()); // filename length
          buffer[ 29 ] = char(it.current()->path().length() >> 8);
+ #endif
  
  	buffer[ 30 ] = char(extra_field_len);
  	buffer[ 31 ] = char(extra_field_len >> 8);
***************
*** 1143,1151 ****
--- 1148,1170 ----
      }
  
      // construct a KZipFileEntry and add it to list
+ #ifdef ORIGINAL_CODE
      KZipFileEntry * e = new KZipFileEntry( this, fileName, perm, mtime, user, group, QString::null,
                                             name, device()->at() + 30 + name.length(), // start
                                             0 /*size unknown yet*/, d->m_compression, 0 /*csize unknown yet*/ );
+ #else
+     int extra_field_len = 0;
+     if ( d->m_extraField == ModificationTime )
+         extra_field_len = 17;	// value also used in doneWriting()
+ 
+     QCString encodedName = QFile::encodeName(name);
+ 
+     KZipFileEntry * e = new KZipFileEntry( this, fileName, perm, mtime, user, 
+ 		group, QString::null,
+                 name, 
+ 		device()->at() + 30 + encodedName.length() + extra_field_len, // start
+                 0 /*size unknown yet*/, d->m_compression, 0 /*csize unknown yet*/ );
+ #endif
      e->setHeaderStart( device()->at() );
      //kdDebug(7040) << "wrote file start: " << e->position() << " name: " << name << endl;
      parentDir->addEntry( e );
***************
*** 1153,1164 ****
--- 1172,1185 ----
      d->m_currentFile = e;
      d->m_fileList.append( e );
  
+ #ifdef	ORIGINAL_CODE
      int extra_field_len = 0;
      if ( d->m_extraField == ModificationTime )
          extra_field_len = 17;	// value also used in doneWriting()
  
      // write out zip header
      QCString encodedName = QFile::encodeName(name);
+ #endif
      int bufferSize = extra_field_len + encodedName.length() + 30;
      //kdDebug(7040) << "KZip::prepareWriting bufferSize=" << bufferSize << endl;
      char* buffer = new char[ bufferSize ];
***************
*** 1280,1288 ****
--- 1301,1316 ----
      if ( d->m_extraField == ModificationTime )
          extra_field_len = 17;	// value also used in doneWriting()
  
+ #ifndef	ORIGINAL_CODE
+     QCString encodedName = QFile::encodeName(d->m_currentFile->path());
+     int csize = device()->at() -
+         d->m_currentFile->headerStart() - 30 -
+ 		encodedName.length() - extra_field_len;
+ #else
      int csize = device()->at() -
          d->m_currentFile->headerStart() - 30 -
  		d->m_currentFile->path().length() - extra_field_len;
+ #endif
      d->m_currentFile->setCompressedSize(csize);
      //kdDebug(7040) << "usize: " << d->m_currentFile->size() << endl;
      //kdDebug(7040) << "csize: " << d->m_currentFile->compressedSize() << endl;