extern MINIZIP_EXPORT int zipOpenNewFileInZip (zipFile file,const char* filename,const zip_fileinfo* zipfi,
const void* extrafield_local,uInt size_extrafield_local,
const void* extrafield_global,uInt size_extrafield_global,
const char* comment,int method,int level)
{
return zipOpenNewFileInZip2 (file, filename, zipfi,
extrafield_local, size_extrafield_local,
extrafield_global, size_extrafield_global,
comment, method, level, 0);
}
static status_t WriteZipFileAux(zipFile zf, const String & baseName, const Message & msg, int compressionLevel, zip_fileinfo * fileInfo)
{
for (MessageFieldNameIterator iter = msg.GetFieldNameIterator(); iter.HasData(); iter++)
{
const String & fn = iter.GetFieldName();
uint32 fieldType;
if (msg.GetInfo(fn, &fieldType) != B_NO_ERROR) return B_ERROR;
switch(fieldType)
{
case B_MESSAGE_TYPE:
{
String newBaseName = baseName;
if ((newBaseName.HasChars())&&(newBaseName.EndsWith('/') == false)) newBaseName += '/';
newBaseName += fn;
// Message fields we treat as sub-directories
MessageRef subMsg;
for (int32 i=0; msg.FindMessage(fn, i, subMsg) == B_NO_ERROR; i++) if (WriteZipFileAux(zf, newBaseName, *subMsg(), compressionLevel, fileInfo) != B_NO_ERROR) return B_ERROR;
}
break;
case B_RAW_TYPE:
{
String fileName = baseName;
if ((fileName.HasChars())&&(fileName.EndsWith('/') == false)) fileName += '/';
fileName += fn;
const void * data;
uint32 numBytes;
for (int32 i=0; msg.FindData(fn, B_RAW_TYPE, i, &data, &numBytes) == B_NO_ERROR; i++)
{
if (zipOpenNewFileInZip2(zf,
fileName(), // file name
fileInfo, // file info
NULL, // const void* extrafield_local,
0, // uInt size_extrafield_local,
NULL, // const void* extrafield_global,
0, // uInt size_extrafield_global,
NULL, // const char* comment,
(compressionLevel>0)?Z_DEFLATED:0, // int method,
compressionLevel, // int compressionLevel
0) != ZIP_OK) return B_ERROR;
if (zipWriteInFileInZip(zf, data, numBytes) != ZIP_OK) return B_ERROR;
if (zipCloseFileInZip(zf) != ZIP_OK) return B_ERROR;
}
}
break;
}
}
return B_NO_ERROR;
}
bool ZipBase::__add(const vector<char>& buffer,const mbs& filename_in_zip,bool raw,unsigned long uncompressed_size,unsigned long crc32)
{
if(!_handle)
return false;
if(zipOpenNewFileInZip2(_handle,filename_in_zip.c_str(),0,0,0,0,0,0,Z_DEFLATED,Z_DEFAULT_COMPRESSION,raw?1:0) != ZIP_OK)
return false;
if(buffer.size())
zipWriteInFileInZip(_handle,&buffer[0],(unsigned int)buffer.size());
if(raw)
zipCloseFileInZipRaw(_handle,uncompressed_size,crc32);
else
zipCloseFileInZip(_handle);
return true;
}
///////////////////////////////////////////////////////////////
//
// CResourceChecker::ReplaceFilesInZIP
//
// Based on example at http://www.winimage.com/zLibDll/minizip.html
// by Ivan A. Krestinin
//
///////////////////////////////////////////////////////////////
int CResourceChecker::ReplaceFilesInZIP( const string& strOrigZip, const string& strTempZip, const vector < string >& pathInArchiveList, const vector < string >& m_upgradedFullPathList )
{
// open source and destination file
zlib_filefunc_def ffunc;
#ifdef WIN32
fill_win32_filefunc(&ffunc);
#else
fill_fopen_filefunc(&ffunc);
#endif
zipFile szip = unzOpen2(strOrigZip.c_str(), &ffunc);
if (szip==NULL) { /*free(tmp_name);*/ return 0; }
zipFile dzip = zipOpen2(strTempZip.c_str(), APPEND_STATUS_CREATE, NULL, &ffunc);
if (dzip==NULL) { unzClose(szip); /*free(tmp_name);*/ return 0; }
// get global commentary
unz_global_info glob_info;
if (unzGetGlobalInfo(szip, &glob_info) != UNZ_OK) { zipClose(dzip, NULL); unzClose(szip); /*free(tmp_name);*/ return 0; }
char* glob_comment = NULL;
if (glob_info.size_comment > 0)
{
glob_comment = (char*)malloc(glob_info.size_comment+1);
if ((glob_comment==NULL)&&(glob_info.size_comment!=0)) { zipClose(dzip, NULL); unzClose(szip); /*free(tmp_name);*/ return 0; }
if ((unsigned int)unzGetGlobalComment(szip, glob_comment, glob_info.size_comment+1) != glob_info.size_comment) { zipClose(dzip, NULL); unzClose(szip); free(glob_comment); /*free(tmp_name);*/ return 0; }
}
// copying files
int n_files = 0;
int rv = unzGoToFirstFile(szip);
while (rv == UNZ_OK)
{
// get zipped file info
unz_file_info unzfi;
char dos_fn[MAX_PATH];
if (unzGetCurrentFileInfo(szip, &unzfi, dos_fn, MAX_PATH, NULL, 0, NULL, 0) != UNZ_OK) break;
char fn[MAX_PATH];
#ifdef WIN32
OemToChar(dos_fn, fn);
#endif
// See if file should be replaced
string fullPathReplacement;
for ( unsigned long i = 0 ; i < pathInArchiveList.size () ; i++ )
if ( stricmp ( fn, pathInArchiveList[i].c_str () ) == 0 )
fullPathReplacement = m_upgradedFullPathList[i];
// Replace file in zip
if ( fullPathReplacement.length () )
{
void* buf = NULL;
unsigned long ulLength = 0;
// Get new file into a buffer
if ( FILE* pFile = File::Fopen ( fullPathReplacement.c_str (), "rb" ) )
{
// Get the file size,
fseek( pFile, 0, SEEK_END );
ulLength = ftell( pFile );
fseek( pFile, 0, SEEK_SET );
// Load file into a buffer
buf = malloc( ulLength );
if ( fread ( buf, 1, ulLength, pFile ) != ulLength )
{
free( buf );
buf = NULL;
}
// Clean up
fclose ( pFile );
}
if( !buf )
break;
// open destination file
zip_fileinfo zfi;
memcpy (&zfi.tmz_date, &unzfi.tmu_date, sizeof(tm_unz));
zfi.dosDate = unzfi.dosDate;
zfi.internal_fa = unzfi.internal_fa;
zfi.external_fa = unzfi.external_fa;
char* extrafield = NULL;
char* commentary = NULL;
int size_local_extra = 0;
void* local_extra = NULL;
int unzfi_size_file_extra = 0;
int method = Z_DEFLATED;
int level = Z_DEFAULT_COMPRESSION;
if (zipOpenNewFileInZip(dzip, dos_fn, &zfi, local_extra, size_local_extra, extrafield, unzfi_size_file_extra, commentary, method, level )!=UNZ_OK)
{free(extrafield); free(commentary); free(local_extra); free(buf); break;}
// write file
if (zipWriteInFileInZip(dzip, buf, ulLength)!=UNZ_OK)
{free(extrafield); free(commentary); free(local_extra); free(buf); break;}
if (zipCloseFileInZip(dzip/*, unzfi.uncompressed_size, unzfi.crc*/)!=UNZ_OK)
{free(extrafield); free(commentary); free(local_extra); free(buf); break;}
free( buf );
}
// Copy file in zip
if ( !fullPathReplacement.length () )
{
char* extrafield = (char*)malloc(unzfi.size_file_extra);
if ((extrafield==NULL)&&(unzfi.size_file_extra!=0)) break;
char* commentary = (char*)malloc(unzfi.size_file_comment);
if ((commentary==NULL)&&(unzfi.size_file_comment!=0)) {free(extrafield); break;}
if (unzGetCurrentFileInfo(szip, &unzfi, dos_fn, MAX_PATH, extrafield, unzfi.size_file_extra, commentary, unzfi.size_file_comment) != UNZ_OK) {free(extrafield); free(commentary); break;}
// open file for RAW reading
int method;
int level;
if (unzOpenCurrentFile2(szip, &method, &level, 1)!=UNZ_OK) {free(extrafield); free(commentary); break;}
int size_local_extra = unzGetLocalExtrafield(szip, NULL, 0);
if (size_local_extra<0) {free(extrafield); free(commentary); break;}
void* local_extra = malloc(size_local_extra);
if ((local_extra==NULL)&&(size_local_extra!=0)) {free(extrafield); free(commentary); break;}
if (unzGetLocalExtrafield(szip, local_extra, size_local_extra)<0) {free(extrafield); free(commentary); free(local_extra); break;}
// this malloc may fail if file very large
void* buf = malloc(unzfi.compressed_size);
if ((buf==NULL)&&(unzfi.compressed_size!=0)) {free(extrafield); free(commentary); free(local_extra); break;}
// read file
int sz = unzReadCurrentFile(szip, buf, unzfi.compressed_size);
if ((unsigned int)sz != unzfi.compressed_size) {free(extrafield); free(commentary); free(local_extra); free(buf); break;}
// open destination file
zip_fileinfo zfi;
memcpy (&zfi.tmz_date, &unzfi.tmu_date, sizeof(tm_unz));
zfi.dosDate = unzfi.dosDate;
zfi.internal_fa = unzfi.internal_fa;
zfi.external_fa = unzfi.external_fa;
if (zipOpenNewFileInZip2(dzip, dos_fn, &zfi, local_extra, size_local_extra, extrafield, unzfi.size_file_extra, commentary, method, level, 1)!=UNZ_OK) {free(extrafield); free(commentary); free(local_extra); free(buf); break;}
// write file
if (zipWriteInFileInZip(dzip, buf, unzfi.compressed_size)!=UNZ_OK) {free(extrafield); free(commentary); free(local_extra); free(buf); break;}
if (zipCloseFileInZipRaw(dzip, unzfi.uncompressed_size, unzfi.crc)!=UNZ_OK) {free(extrafield); free(commentary); free(local_extra); free(buf); break;}
if (unzCloseCurrentFile(szip)==UNZ_CRCERROR) {free(extrafield); free(commentary); free(local_extra); free(buf); break;}
free(commentary);
free(buf);
free(extrafield);
free(local_extra);
n_files ++;
}
rv = unzGoToNextFile(szip);
}
zipClose(dzip, glob_comment);
unzClose(szip);
free(glob_comment);
return rv==UNZ_END_OF_LIST_OF_FILE;
}
static int hb_zipDeleteFile( const char * szZipFile, const char * szFileMask )
{
char szTempFile[ HB_PATH_MAX ];
char szCurrFile[ HB_PATH_MAX ];
PHB_FNAME pFileName;
HB_FHANDLE hFile;
unzFile hUnzip;
zipFile hZip;
unz_global_info ugi;
unz_file_info ufi;
zip_fileinfo zfi;
char * pszGlobalComment = NULL;
char * pszFileComment = NULL;
void * pExtraField = NULL;
void * pLocalExtraField = NULL;
int iFilesLeft = 0;
int iFilesDel = 0;
int iExtraFieldLen;
int method;
int level;
int iResult;
char * pszFree;
/* open source file */
hUnzip = unzOpen( hb_fsNameConv( szZipFile, &pszFree ) );
if( pszFree )
hb_xfree( pszFree );
if( hUnzip == NULL )
return UNZ_ERRNO;
pFileName = hb_fsFNameSplit( szZipFile );
hFile = hb_fsCreateTemp( pFileName->szPath, NULL, FC_NORMAL, szTempFile );
hZip = NULL;
if( hFile != FS_ERROR )
{
hb_fsClose( hFile );
hZip = zipOpen( szTempFile, APPEND_STATUS_CREATE );
}
hb_xfree( pFileName );
if( hZip == NULL )
{
unzClose( hUnzip );
return UNZ_ERRNO;
}
iResult = unzGetGlobalInfo( hUnzip, &ugi );
if( iResult == UNZ_OK )
{
if( ugi.size_comment > 0 )
{
pszGlobalComment = ( char * ) hb_xgrab( ugi.size_comment + 1 );
if( ( uLong ) unzGetGlobalComment( hUnzip, pszGlobalComment,
ugi.size_comment ) != ugi.size_comment )
iResult = UNZ_ERRNO;
pszGlobalComment[ ugi.size_comment ] = '\0';
}
if( iResult == UNZ_OK )
iResult = unzGoToFirstFile( hUnzip );
}
while( iResult == UNZ_OK )
{
iResult = unzGetCurrentFileInfo( hUnzip, &ufi, szCurrFile, HB_PATH_MAX - 1, NULL, 0, NULL, 0 );
if( iResult != UNZ_OK )
break;
if( hb_strMatchFile( szCurrFile, szFileMask ) )
iFilesDel++;
else
{
if( ufi.size_file_extra )
pExtraField = ( char * ) hb_xgrab( ufi.size_file_extra );
if( ufi.size_file_comment )
pszFileComment = ( char * ) hb_xgrab( ufi.size_file_comment + 1 );
iResult = unzGetCurrentFileInfo( hUnzip, &ufi, NULL, 0,
pExtraField, ufi.size_file_extra,
pszFileComment, ufi.size_file_comment );
if( pszFileComment )
pszFileComment[ ufi.size_file_comment ] = '\0';
if( iResult != UNZ_OK )
break;
iResult = unzOpenCurrentFile2( hUnzip, &method, &level, 1 );
if( iResult != UNZ_OK )
break;
iExtraFieldLen = unzGetLocalExtrafield( hUnzip, NULL, 0 );
if( iExtraFieldLen < 0 )
{
iResult = UNZ_ERRNO;
break;
}
else if( iExtraFieldLen > 0 )
{
pLocalExtraField = hb_xgrab( iExtraFieldLen );
if( unzGetLocalExtrafield( hUnzip, pLocalExtraField, iExtraFieldLen ) != iExtraFieldLen )
{
iResult = UNZ_ERRNO;
break;
}
}
memset( &zfi, 0, sizeof( zfi ) );
memcpy( &zfi.tmz_date, &ufi.tmu_date, sizeof( tm_unz ) );
zfi.dosDate = ufi.dosDate;
zfi.internal_fa = ufi.internal_fa;
zfi.external_fa = ufi.external_fa;
iResult = zipOpenNewFileInZip2( hZip, szCurrFile, &zfi, pLocalExtraField, iExtraFieldLen, pExtraField, ufi.size_file_extra, pszFileComment, method, level, 1 );
if( iResult != UNZ_OK )
break;
if( ufi.compressed_size )
{
void * buffer = hb_xgrab( HB_Z_IOBUF_SIZE );
uLong ulLeft = ufi.compressed_size;
while( ulLeft > 0 )
{
int iRead = HB_MIN( ulLeft, HB_Z_IOBUF_SIZE );
iResult = unzReadCurrentFile( hUnzip, ( voidp ) buffer, iRead );
if( iResult < 0 )
break;
if( iResult != iRead )
{
iResult = UNZ_ERRNO;
break;
}
iResult = zipWriteInFileInZip( hZip, ( voidp ) buffer, iRead );
if( iResult != UNZ_OK )
break;
ulLeft -= iRead;
}
hb_xfree( buffer );
if( iResult != UNZ_OK )
break;
}
iResult = zipCloseFileInZipRaw( hZip, ufi.uncompressed_size, ufi.crc );
if( iResult != UNZ_OK )
break;
iResult = unzCloseCurrentFile( hUnzip );
if( iResult != UNZ_OK )
break;
if( pExtraField )
{
hb_xfree( pExtraField );
pExtraField = NULL;
}
if( pszFileComment )
{
hb_xfree( pszFileComment );
pszFileComment = NULL;
}
if( pLocalExtraField )
{
hb_xfree( pLocalExtraField );
pLocalExtraField = NULL;
}
iFilesLeft++;
}
iResult = unzGoToNextFile( hUnzip );
}
if( pExtraField )
hb_xfree( pExtraField );
if( pszFileComment )
hb_xfree( pszFileComment );
if( pLocalExtraField )
hb_xfree( pLocalExtraField );
if( iFilesDel == 0 )
iResult = UNZ_ERRNO;
else if( iResult == UNZ_END_OF_LIST_OF_FILE )
iResult = UNZ_OK;
if( iResult != UNZ_OK )
zipClose( hZip, NULL );
else
iResult = zipClose( hZip, pszGlobalComment );
unzClose( hUnzip );
if( pszGlobalComment )
hb_xfree( pszGlobalComment );
if( iResult != UNZ_OK )
hb_fsDelete( szTempFile );
else
{
hb_fsDelete( szZipFile );
if( iFilesLeft == 0 )
hb_fsDelete( szTempFile );
else if( ! hb_fsRename( szTempFile, szZipFile ) )
iResult = UNZ_ERRNO;
}
return iResult;
}
int Zip::compressFiles(std::string sourcePath, std::vector<std::string> files, std::string output){
char buffer[Zip::WRITE_BUFFER_SIZE];
zipFile zf = zipOpen(output.c_str(), APPEND_STATUS_CREATE);
if (zf == 0){
return 3;
}
for (unsigned int i= 0; i < files.size(); i++) {
std::string fileToZip;
if (sourcePath.size() == 0){
fileToZip = files[i];
} else {
fileToZip = sourcePath.append("\\").append(files[i]);
}
zip_fileinfo fileInfo = {};
ZeroMemory( &fileInfo.tmz_date, sizeof( fileInfo.tmz_date ) );
filetime(fileToZip.c_str(), &fileInfo.tmz_date, &fileInfo.dosDate);
int error = zipOpenNewFileInZip2(zf, fileToZip.c_str(),
&fileInfo, 0, 0, 0, 0,
0,
Z_DEFLATED,
Z_DEFAULT_COMPRESSION, 0
);
if (error != ZIP_OK) {
zipClose(zf, 0);
return 4;
}
FILE *fin = fopen(fileToZip.c_str(), "rb");
if (fin == 0) {
zipClose(zf, NULL);
return 5;
}
int size_read;
do {
size_read = (int)fread(&buffer, 1, Zip::WRITE_BUFFER_SIZE, fin);
if (size_read < Zip::WRITE_BUFFER_SIZE)
if (feof(fin) == 0) {
zipClose(zf, 0);
fclose(fin);
return 6;
}
if (size_read > 0) {
error = zipWriteInFileInZip (zf, &buffer, size_read);
if (error < 0) {
zipClose(zf, 0);
fclose(fin);
return 7;
}
}
} while (size_read > 0);
if (fin){
fclose(fin);
}
error = zipCloseFileInZip(zf);
if (error != ZIP_OK) {
zipClose(zf, 0);
return 8;
}
}
int errclose = zipClose(zf, 0);
if (errclose != ZIP_OK) {
return 9;
}
return 10;
}
