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

2008-09-01 12:39 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbziparch/hbziparc.c
   * contrib/hbziparch/hbzipnew.cpp
     * One variable rename missed from previous commit.
This commit is contained in:
Viktor Szakats
2008-09-01 10:39:47 +00:00
parent 61eb31ae0b
commit 53ee42aedd
3 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -8,6 +8,11 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-09-01 12:39 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbziparch/hbziparc.c
* contrib/hbziparch/hbzipnew.cpp
* One variable rename missed from previous commit.
2008-09-01 12:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbziparch/hbziparc.h
* contrib/hbziparch/hbziparc.c

40
harbour/contrib/hbziparch/hbziparc.c
View File

@@ -94,14 +94,14 @@ static void ResetAttribs( PHB_ITEM pFileToZip, PHB_ITEM pFileAttribs )
}
}
static void UnzipCreateArray( const char * szSkleton, PHB_ITEM pList, PHB_ITEM hbza_ZipArray )
static void UnzipCreateArray( const char * szSkleton, PHB_ITEM pList, PHB_ITEM pZipArray )
{
int ul;
int ulLen = hb_arrayLen( hbza_ZipArray );
int ulLen = hb_arrayLen( pZipArray );
for( ul = 0; ul < ulLen; ul++ )
{
PHB_ITEM pZipEntry = hb_arrayGetItemPtr( hbza_ZipArray, ul + 1 );
PHB_ITEM pZipEntry = hb_arrayGetItemPtr( pZipArray, ul + 1 );
const char * szEntry = hb_arrayGetCPtr( pZipEntry, 1 );
BOOL bOkAdd = TRUE;
@@ -1017,26 +1017,26 @@ HB_FUNC( HB_UNZIPFILE )
if( hb_TestForPKS( szZipFileName ) <= 0 )
{
PHB_ITEM hbza_ZipArray = hb___GetFileNamesFromZip( szZipFileName, TRUE );
PHB_ITEM pZipArray = hb___GetFileNamesFromZip( szZipFileName, TRUE );
if( pUnzip )
{
if( HB_IS_STRING( pUnzip ) )
{
UnzipCreateArray( hb_itemGetCPtr( pUnzip ), pUnzipFiles, hbza_ZipArray );
UnzipCreateArray( hb_itemGetCPtr( pUnzip ), pUnzipFiles, pZipArray );
}
else if( HB_IS_ARRAY( pUnzip ) )
{
int uiZ, uiZLen = hb_arrayLen( pUnzip );
for( uiZ = 0; uiZ < uiZLen; uiZ++ )
UnzipCreateArray( hb_arrayGetCPtr( pUnzip, uiZ + 1 ), pUnzipFiles, hbza_ZipArray );
UnzipCreateArray( hb_arrayGetCPtr( pUnzip, uiZ + 1 ), pUnzipFiles, pZipArray );
}
}
else
{
/* s.r. change "*.*" to "*" because file without extension were ignored */
UnzipCreateArray( "*", pUnzipFiles, hbza_ZipArray );
UnzipCreateArray( "*", pUnzipFiles, pZipArray );
}
if( hb_arrayLen( pUnzipFiles ) > 0 )
@@ -1052,7 +1052,7 @@ HB_FUNC( HB_UNZIPFILE )
hb_itemRelease( pProgress );
}
hb_itemRelease( hbza_ZipArray );
hb_itemRelease( pZipArray );
}
hb_xfree( szZipFileName );
@@ -1148,17 +1148,17 @@ HB_FUNC( HB_ZIPDELETEFILES )
if( pDelZip )
{
PHB_ITEM hbza_ZipArray;
PHB_ITEM pZipArray;
char * szZipFileName = hb___CheckFile( hb_parc( 1 ) );
int ulLen;
hbza_ZipArray = hb___GetFileNamesFromZip( szZipFileName, TRUE );
ulLen = hb_arrayLen( hbza_ZipArray );
pZipArray = hb___GetFileNamesFromZip( szZipFileName, TRUE );
ulLen = hb_arrayLen( pZipArray );
if( !ulLen )
{
hb_xfree( szZipFileName );
hb_itemRelease( hbza_ZipArray );
hb_itemRelease( pZipArray );
hb_retl( bRet );
return;
}
@@ -1166,14 +1166,14 @@ HB_FUNC( HB_ZIPDELETEFILES )
if( HB_IS_STRING( pDelZip ) )
{
if( hb_itemGetCLen( pDelZip ) > 0 )
UnzipCreateArray( hb_itemGetCPtr( pDelZip ), pDelZipFiles, hbza_ZipArray );
UnzipCreateArray( hb_itemGetCPtr( pDelZip ), pDelZipFiles, pZipArray );
}
else if( HB_IS_ARRAY( pDelZip ) )
{
int uiIn, uiInLen = hb_arrayLen(pDelZip);
for( uiIn = 0; uiIn < uiInLen; uiIn++ )
UnzipCreateArray( hb_arrayGetCPtr( pDelZip, uiIn + 1 ), pDelZipFiles, hbza_ZipArray );
UnzipCreateArray( hb_arrayGetCPtr( pDelZip, uiIn + 1 ), pDelZipFiles, pZipArray );
}
else if( HB_IS_NUMERIC( pDelZip ) )
{
@@ -1181,7 +1181,7 @@ HB_FUNC( HB_ZIPDELETEFILES )
if( iIndex > 0 && iIndex <= ulLen )
{
PHB_ITEM pZipEntry = hb_arrayGetItemPtr( hbza_ZipArray, iIndex );
PHB_ITEM pZipEntry = hb_arrayGetItemPtr( pZipArray, iIndex );
PHB_ITEM Temp = hb_itemNew( NULL );
hb_arrayAddForward( pDelZipFiles, hb_itemPutC( Temp, hb_arrayGetCPtr( pZipEntry, 1 ) ) );
hb_itemRelease( Temp );
@@ -1196,7 +1196,7 @@ HB_FUNC( HB_ZIPDELETEFILES )
}
hb_xfree( szZipFileName );
hb_itemRelease( hbza_ZipArray );
hb_itemRelease( pZipArray );
}
hb_itemRelease( pDelZipFiles );
@@ -1447,7 +1447,7 @@ HB_FUNC( HB_UNZIPFILEINDEX )
if( pDelZip )
{
PHB_ITEM hbza_ZipArray;
PHB_ITEM pZipArray;
PHB_ITEM Temp, DelZip;
char * szZipFileName;
int ulLen;
@@ -1456,8 +1456,8 @@ HB_FUNC( HB_UNZIPFILEINDEX )
szZipFileName = hb___CheckFile( hb_parc( 1 ) );
hbza_ZipArray = hb___GetFileNamesFromZip( szZipFileName, TRUE );
ulLen = hb_arrayLen( hbza_ZipArray );
pZipArray = hb___GetFileNamesFromZip( szZipFileName, TRUE );
ulLen = hb_arrayLen( pZipArray );
if( HB_IS_NUMERIC( pDelZip ) )
{
@@ -1501,7 +1501,7 @@ HB_FUNC( HB_UNZIPFILEINDEX )
hb_itemRelease( DelZip );
hb_xfree( szZipFileName );
hb_itemRelease( hbza_ZipArray );
hb_itemRelease( pZipArray );
}
}

14
harbour/contrib/hbziparch/hbzipnew.cpp
View File

@@ -371,7 +371,7 @@ int hb_CmpPkSpan( char *szFile, PHB_ITEM pArray, int iCompLevel, PHB_ITEM pBlock
PHB_ITEM hb___GetFileNamesFromZip( char * szFile, BOOL iMode )
{
PHB_ITEM hbza_ZipArray;
PHB_ITEM pZipArray;
int iNumberOfFiles;
ULONG ulCount;
bool iReturn = true;
@@ -410,8 +410,8 @@ PHB_ITEM hb___GetFileNamesFromZip( char * szFile, BOOL iMode )
{
iNumberOfFiles = szZip.GetCount();
hbza_ZipArray = hb_itemNew( NULL );
hb_arrayNew( hbza_ZipArray, iNumberOfFiles );
pZipArray = hb_itemNew( NULL );
hb_arrayNew( pZipArray, iNumberOfFiles );
time_t theTime;
tm * SzTime;
@@ -514,23 +514,23 @@ PHB_ITEM hb___GetFileNamesFromZip( char * szFile, BOOL iMode )
hb_arraySetCL( TempArray, HBZA_FI_TIME, szTime, 8 );
hb_arraySetCL( TempArray, HBZA_FI_ATTR, szAttr, 5 );
hb_arraySetForward( hbza_ZipArray, ulCount+1, TempArray );
hb_arraySetForward( pZipArray, ulCount+1, TempArray );
hb_itemRelease( TempArray );
}
else
{
CZipString szTempString = ( LPCTSTR ) fh.GetFileName();
const char * szFileNameInZip = ( const char * ) szTempString;
hb_arraySetC( hbza_ZipArray, ulCount + 1, ( char * ) szFileNameInZip );
hb_arraySetC( pZipArray, ulCount + 1, ( char * ) szFileNameInZip );
}
}
}
else
hbza_ZipArray = hb_itemArrayNew( 0 );
pZipArray = hb_itemArrayNew( 0 );
szZip.Close();
return hbza_ZipArray;
return pZipArray;
}
BOOL hb_IsPassWord( char *szFile )