fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

See changelog 2000-7-16-20:30 GMT -3

Browse Source
This commit is contained in:
Luiz Rafael Culik
2000-07-16 23:49:59 +00:00
parent 4dc4cf4130
commit fc5cb6c683
3 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
harbour/contrib/hbzlib/hbzip.h
View File

@@ -58,6 +58,7 @@ extern int hb___ExtractCurrentFile(unzFile uf,BOOL popt_extract_without_path,BOO
extern void hb____ChangeFileDate(char *filename,uLong dosdate,tm_unz tmu_date);
extern int hb___MakeDir(char *szNewDirectory);
extern int hb___GetNumbersofFilestoUnzip(char *szFile);
extern PHB_ITEM hb___GetFilesNamesFromZip(char *szFile);
#if defined(HB_EXTERN_C)
}
#endif

2
harbour/contrib/hbzlib/makefile.bc
View File

@@ -48,7 +48,7 @@ ARFLAGS = /P32
INCLUDE_DIR = ..\..\include
ZLIB_DIR = .
WINSYS_DIR = \WINDOWS\SYSTEM
CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) -y
CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) -y
CLIBFLAGS =$(CFLAGS)
HARBOUR_EXE = $(BIN_DIR)\harbour.exe
HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)

72
harbour/contrib/hbzlib/zipfile2.c
View File

@@ -368,10 +368,51 @@ int hb___ExtractCurrentFile(unzFile szUnzipFile,BOOL popt_extract_without_path,B
int hb___GetNumbersofFilestoUnzip(char *szFile)
{
int iNumbersOfFiles;
/*int iNumbersOfFiles;*/
const char *szZipFileName=NULL;
char szFilename_Try[512];
unz_global_info szGlobalUnzipInfo;
szZipFileName = szFile;
/* if (szZipFileName == NULL)
{
szZipFileName = szFile;
}
*/
if (szZipFileName!=NULL)
{
strcpy(szFilename_Try,szZipFileName);
szUnzipFile = unzOpen(szZipFileName);
if (szUnzipFile==NULL)
{
strcat(szFilename_Try,".zip");
szUnzipFile = unzOpen(szFilename_Try);
}
}
if (szUnzipFile==NULL)
{
exit (1);
}
err = unzGetGlobalInfo (szUnzipFile,&szGlobalUnzipInfo);
/* if (err==ZIP_OK) {
iNumbersOfFiles=szGlobalUnzipInfo.number_entry;
}
*/
unzCloseCurrentFile(szUnzipFile);
/* return iNumbersOfFiles; to avoid warning */
return szGlobalUnzipInfo.number_entry;
}
PHB_ITEM hb___GetFilesNamesFromZip(char *szFile)
{
const char *szZipFileName=NULL;
char szFilename_Try[512];
char szFileNameinZip[256];
int iNumbersOfFiles;
PHB_ITEM pItem=NULL;
PHB_ITEM pArray=NULL;
uLong uiCount;
unz_global_info szGlobalUnzipInfo;
if (szZipFileName == NULL)
{
@@ -391,13 +432,36 @@ int iNumbersOfFiles;
if (szUnzipFile==NULL)
{
exit (1);
exit(1);
}
err = unzGetGlobalInfo (szUnzipFile,&szGlobalUnzipInfo);
if (err==ZIP_OK) {
iNumbersOfFiles=szGlobalUnzipInfo.number_entry;;
iNumbersOfFiles=szGlobalUnzipInfo.number_entry;
pArray=hb_itemArrayNew( iNumbersOfFiles );
}
for(uiCount=0;uiCount<iNumbersOfFiles;uiCount++) {
unz_file_info file_info;
err = unzGetCurrentFileInfo(szUnzipFile,&file_info,szFileNameinZip,sizeof(szFileNameinZip),NULL,0,NULL,0);
if (err!=UNZ_OK)
{
break;
}
pItem=hb_itemPutC(NULL,szFileNameinZip);
hb_itemArrayPut(pArray,uiCount+1,pItem);
hb_itemRelease(pItem);
if ((uiCount+1)<iNumbersOfFiles)
{
err = unzGoToNextFile(szUnzipFile);
if (err!=UNZ_OK)
{
break;
}
}
}
unzCloseCurrentFile(szUnzipFile);
hb_itemReturn(pArray);
return iNumbersOfFiles; /* to avoid warning */
}