300e887480
+ fix -Wtautological-bitwise-compare + fix -Wimplicit-int-float-conversion + fix -Wmisleading-indentation + fix -Wrange-loop-construct + suppress -Wdeprecated-copy of 3rd party libs
325 lines
9.5 KiB
C++
325 lines
9.5 KiB
C++
|
|
#include "zipios-config.h"
|
|
|
|
#include "meta-iostreams.h"
|
|
#include <iterator>
|
|
#include <string>
|
|
#include <cassert>
|
|
|
|
#include "zipios_common.h"
|
|
#include "ziphead.h"
|
|
#include "zipheadio.h"
|
|
#include "zipios_defs.h"
|
|
|
|
#include "outputstringstream.h"
|
|
|
|
namespace zipios {
|
|
|
|
using std::ios ;
|
|
|
|
bool operator== ( const ZipLocalEntry &zlh, const ZipCDirEntry &ze ) {
|
|
// Not all fields need to be identical. Some of the information
|
|
// may be put in a data descriptor that trails the compressed
|
|
// data, according to the specs (The trailing data descriptor
|
|
// can contain crc_32, compress_size and uncompress_size.)
|
|
|
|
// Experience has shown that extra_field and extra_field_len
|
|
// can differ too.
|
|
|
|
// cerr << "----- BEGIN -----" << endl ;
|
|
// cerr << ( zlh.extract_version == ze.extract_version ) << endl ;
|
|
// cerr << ( zlh.gp_bitfield == ze.gp_bitfield ) << endl ;
|
|
// cerr << ( zlh.compress_method == ze.compress_method ) << endl ;
|
|
// cerr << ( zlh.last_mod_ftime == ze.last_mod_ftime ) << endl ;
|
|
// cerr << ( zlh.last_mod_fdate == ze.last_mod_fdate ) << endl ;
|
|
|
|
// cerr << ( zlh.filename_len == ze.filename_len ) << endl ;
|
|
|
|
// cerr << ( zlh.filename == ze.filename ) << endl ;
|
|
// cerr << "----- END -----" << endl ;
|
|
return ( zlh.extract_version == ze.extract_version &&
|
|
zlh.gp_bitfield == ze.gp_bitfield &&
|
|
zlh.compress_method == ze.compress_method &&
|
|
zlh.last_mod_ftime == ze.last_mod_ftime &&
|
|
zlh.last_mod_fdate == ze.last_mod_fdate &&
|
|
zlh.filename_len == ze.filename_len &&
|
|
|
|
zlh.filename == ze.filename ) ;
|
|
}
|
|
|
|
//
|
|
// ZipLocalEntry methods
|
|
//
|
|
|
|
const uint32 ZipLocalEntry::signature = 0x04034b50 ;
|
|
|
|
|
|
// Commented because same as default...
|
|
//ZipCDirEntry &ZipCDirEntry::operator=( const class ZipCDirEntry &src ) {
|
|
//writer_version = src.writer_version ;
|
|
//extract_version = src.extract_version ;
|
|
//gp_bitfield = src.gp_bitfield ;
|
|
//compress_method = src.compress_method ;
|
|
//last_mod_ftime = src.last_mod_ftime ;
|
|
//last_mod_fdate = src.last_mod_fdate ;
|
|
//crc_32 = src.crc_32 ;
|
|
//compress_size = src.compress_size ;
|
|
//uncompress_size = src.uncompress_size ;
|
|
//filename_len = src.filename_len ;
|
|
//extra_field_len = src.extra_field_len ;
|
|
//file_comment_len = src.file_comment_len ;
|
|
//disk_num_start = src.disk_num_start ;
|
|
//intern_file_attr = src.intern_file_attr ;
|
|
//extern_file_attr = src.extern_file_attr ;
|
|
//rel_offset_loc_head = src.rel_offset_loc_head ;
|
|
|
|
//filename = src.filename ;
|
|
//extra_field = src.extra_field ;
|
|
//file_comment = src.file_comment ;
|
|
|
|
//return *this ;
|
|
//}
|
|
|
|
bool EndOfCentralDirectory::checkSignature ( uint32 sig ) const {
|
|
return signature == sig ;
|
|
}
|
|
|
|
void ZipLocalEntry::setDefaultExtract() {
|
|
extract_version = 20 ; // version number
|
|
}
|
|
|
|
string ZipLocalEntry::getComment() const {
|
|
return "" ; // No comment in a local entry
|
|
}
|
|
|
|
uint32 ZipLocalEntry::getCompressedSize() const {
|
|
return compress_size ;
|
|
}
|
|
|
|
uint32 ZipLocalEntry::getCrc() const {
|
|
return crc_32 ;
|
|
}
|
|
|
|
vector< unsigned char > ZipLocalEntry::getExtra() const {
|
|
return extra_field ;
|
|
}
|
|
|
|
StorageMethod ZipLocalEntry::getMethod() const {
|
|
return static_cast< StorageMethod >( compress_method ) ;
|
|
}
|
|
|
|
string ZipLocalEntry::getName() const {
|
|
return filename ;
|
|
}
|
|
|
|
string ZipLocalEntry::getFileName() const {
|
|
if ( isDirectory() )
|
|
return string() ;
|
|
string::size_type pos ;
|
|
pos = filename.find_last_of( separator ) ;
|
|
if ( pos != string::npos ) { // separator found!
|
|
// isDirectory() check means pos should not be last, so pos+1 is ok
|
|
return filename.substr( pos + 1 ) ;
|
|
} else {
|
|
return filename ;
|
|
}
|
|
}
|
|
|
|
uint32 ZipLocalEntry::getSize() const {
|
|
return uncompress_size ;
|
|
}
|
|
|
|
int ZipLocalEntry::getTime() const {
|
|
return ( last_mod_fdate << 16 ) + last_mod_ftime ;
|
|
// FIXME: what to do with this time date thing? (not only here?)
|
|
}
|
|
|
|
bool ZipLocalEntry::isValid() const {
|
|
return _valid ;
|
|
}
|
|
|
|
bool ZipLocalEntry::isDirectory() const {
|
|
//std::assert( filename.size() != 0 ) ;
|
|
return filename[ filename.size() - 1 ] == separator ;
|
|
}
|
|
|
|
|
|
void ZipLocalEntry::setComment( const string & ) {
|
|
// A local entry cannot hold a comment
|
|
}
|
|
|
|
void ZipLocalEntry::setCompressedSize( uint32 size ) {
|
|
compress_size = size ;
|
|
}
|
|
|
|
void ZipLocalEntry::setCrc( uint32 crc ) {
|
|
crc_32 = crc ;
|
|
}
|
|
|
|
void ZipLocalEntry::setExtra( const vector< unsigned char > &extra ) {
|
|
extra_field = extra ;
|
|
extra_field_len = extra_field.size() ;
|
|
}
|
|
|
|
void ZipLocalEntry::setMethod( StorageMethod method ) {
|
|
compress_method = static_cast< uint16 >( method ) ;
|
|
}
|
|
|
|
void ZipLocalEntry::setName( const string &name ) {
|
|
filename = name ;
|
|
filename_len = filename.size() ;
|
|
}
|
|
|
|
void ZipLocalEntry::setSize( uint32 size ) {
|
|
uncompress_size = size ;
|
|
}
|
|
|
|
void ZipLocalEntry::setTime( int time ) {
|
|
// FIXME: fix time setting here, and ind flist and elsewhere. Define the
|
|
// date time semantics before mucking about - how surprising
|
|
|
|
// Mark Donszelmann: added these lines to make zip work for winzip
|
|
last_mod_fdate = (time >> 16) & 0x0000FFFF;
|
|
last_mod_ftime = time & 0x0000FFFF;
|
|
}
|
|
|
|
string ZipLocalEntry::toString() const {
|
|
OutputStringStream sout ;
|
|
sout << filename << " (" << uncompress_size << " bytes, " ;
|
|
sout << compress_size << " bytes compressed)" ;
|
|
return sout.str() ;
|
|
}
|
|
|
|
int ZipLocalEntry::getLocalHeaderSize() const {
|
|
return 30 + filename.size() + extra_field.size() ;
|
|
}
|
|
|
|
bool ZipLocalEntry::trailingDataDescriptor() const {
|
|
// gp_bitfield bit 3 is one, if this entry uses a trailing data
|
|
// descriptor to keep size, compressed size and crc-32
|
|
// fields.
|
|
if ( ( gp_bitfield & 4 ) == 4 )
|
|
return true ;
|
|
else
|
|
return false ;
|
|
}
|
|
|
|
FileEntry *ZipLocalEntry::clone() const {
|
|
return new ZipLocalEntry( *this ) ;
|
|
}
|
|
|
|
|
|
//
|
|
// ZipCDirEntry methods
|
|
//
|
|
|
|
const uint32 ZipCDirEntry::signature = 0x02014b50 ;
|
|
|
|
void ZipCDirEntry::setDefaultWriter() {
|
|
writer_version = 0 ;
|
|
#ifdef WIN32
|
|
writer_version |= static_cast< uint16 >( 0 ) << 8 ; // Windows, DOS
|
|
#else
|
|
writer_version |= static_cast< uint16 >( 3 ) << 8 ; // Unix
|
|
#endif
|
|
writer_version |= 20 ; // version number
|
|
}
|
|
|
|
string ZipCDirEntry::getComment() const {
|
|
return file_comment ;
|
|
}
|
|
|
|
uint32 ZipCDirEntry::getLocalHeaderOffset() const {
|
|
return rel_offset_loc_head ;
|
|
}
|
|
|
|
void ZipCDirEntry::setLocalHeaderOffset( uint32 offset ) {
|
|
rel_offset_loc_head = offset ;
|
|
}
|
|
|
|
|
|
void ZipCDirEntry::setComment( const string &comment ) {
|
|
file_comment = comment ;
|
|
file_comment_len = file_comment.size() ;
|
|
}
|
|
|
|
|
|
string ZipCDirEntry::toString() const {
|
|
OutputStringStream sout ;
|
|
sout << filename << " (" << uncompress_size << " bytes, " ;
|
|
sout << compress_size << " bytes compressed)" ;
|
|
return sout.str() ;
|
|
}
|
|
|
|
|
|
int ZipCDirEntry::getCDirHeaderSize() const {
|
|
return 46 + filename.size() + extra_field.size() + file_comment.size() ;
|
|
}
|
|
|
|
|
|
FileEntry *ZipCDirEntry::clone() const {
|
|
return new ZipCDirEntry( *this ) ;
|
|
}
|
|
|
|
|
|
//
|
|
// EndOfCentralDirectory methods
|
|
//
|
|
|
|
const uint32 EndOfCentralDirectory::signature = 0x06054b50 ;
|
|
|
|
bool EndOfCentralDirectory::read( vector<unsigned char> &buf, int pos ) {
|
|
if ( ( buf.size() - pos < sizeof( uint32 ) ) ||
|
|
( ! checkSignature( &( buf[ pos ] ) ) ) )
|
|
return false ;
|
|
|
|
eocd_offset_from_end = buf.size() - pos ;
|
|
pos += sizeof( uint32 ) ;
|
|
disk_num = ztohs( &( buf[ pos ] ) ) ; pos += sizeof( uint16 ) ;
|
|
cdir_disk_num = ztohs( &( buf[ pos ] ) ) ; pos += sizeof( uint16 ) ;
|
|
cdir_entries = ztohs( &( buf[ pos ] ) ) ; pos += sizeof( uint16 ) ;
|
|
cdir_tot_entries = ztohs( &( buf[ pos ] ) ) ; pos += sizeof( uint16 ) ;
|
|
cdir_size = ztohl( &( buf[ pos ] ) ) ; pos += sizeof( uint32 ) ;
|
|
cdir_offset = ztohl( &( buf[ pos ] ) ) ; pos += sizeof( uint32 ) ;
|
|
zip_comment_len = ztohs( &( buf[ pos ] ) ) ; pos += sizeof( uint16 ) ;
|
|
// cerr << "Zip comment length = " << zip_comment_len << endl ;
|
|
// cerr << "Length of remaining file = " << buf.size() - pos << endl ;
|
|
|
|
return true ; // Dummy
|
|
}
|
|
|
|
bool EndOfCentralDirectory::checkSignature ( unsigned char *buf ) const {
|
|
// cerr << "potential header: " << ztohl( buf ) << endl ;
|
|
return checkSignature( ztohl( buf ) ) ;
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
/** \file
|
|
Implementation of routines for reading the central directory and
|
|
local headers of a zip archive.
|
|
*/
|
|
|
|
/*
|
|
Zipios++ - a small C++ library that provides easy access to .zip files.
|
|
Copyright (C) 2000 Thomas Søndergaard
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|