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

2011-10-27 19:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbziparc/ziparc.prg
    ! HB_ZIPFILE(): one fix to filename matching
    ! HB_UNZIPFILE(): two fixes to previous patch
    ; Patch by Grigory Filatov.
This commit is contained in:
Viktor Szakats
2011-10-27 17:13:03 +00:00
parent 02f58540b3
commit 69e5d3a0fc
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -16,6 +16,12 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-10-27 19:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbziparc/ziparc.prg
! HB_ZIPFILE(): one fix to filename matching
! HB_UNZIPFILE(): two fixes to previous patch
; Patch by Grigory Filatov.
2011-10-27 14:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbexpat/core.c
! fixed two errors in conditional code for <=1.95.8 expat versions

6
harbour/contrib/hbziparc/ziparc.prg
View File

@@ -347,7 +347,8 @@ FUNCTION hb_ZipFile( cFileName,;
ENDIF
NEXT
ELSE
IF AScan( aExclFile, {| cExclFile | hb_FileMatch( cFN, cExclFile ) } ) == 0
hb_FNameSplit( cFN, NIL, @cName, @cExt )
IF AScan( aExclFile, {| cExclFile | hb_FileMatch( hb_FNameMerge( NIL, cName, cExt ), cExclFile ) } ) == 0
AAdd( aProcFile, cFN )
ENDIF
ENDIF
@@ -422,7 +423,7 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
DEFAULT lWithPath TO .F.
IF lWithPath
IF hb_DirCreate( cPath ) != 0
IF hb_DirCreate( cPath ) != 0 .AND. !hb_DirExists( cPath )
lRetVal := .F.
ENDIF
ENDIF
@@ -468,6 +469,7 @@ FUNCTION hb_UnzipFile( cFileName, bUpdate, lWithPath, cPassword, cPath, acFiles,
( hHandle := FCreate( cPath + cZipName ) ) != F_ERROR
IF hb_UnzipFileOpen( hUnzip, cPassword ) != UNZ_OK
lRetVal := .F.
EXIT
ENDIF