From dfeb43457a03bd5f90af89d1f271ee78532a2d19 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 30 Jul 2008 09:17:10 +0000 Subject: [PATCH] 2008-07-30 11:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/xhb/dirrec.prg ! initialize cAttr parameter * harbour/contrib/hbmzip/ioapi.c * use hb_fopen() instead of fopen() to respect filename conversions: _SET_FILECASE, _SET_DIRCASE, _SET_DIRSEPARATOR, _SET_TRIMFILENAME --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbmzip/ioapi.c | 3 ++- harbour/contrib/xhb/dirrec.prg | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5d0c9bdad9..eeaf9022a6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-30 11:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/xhb/dirrec.prg + ! initialize cAttr parameter + + * harbour/contrib/hbmzip/ioapi.c + * use hb_fopen() instead of fopen() to respect filename conversions: + _SET_FILECASE, _SET_DIRCASE, _SET_DIRSEPARATOR, _SET_TRIMFILENAME + 2008-07-30 03:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtwvt/gtwvt.c ! Fixed one MSVC 64 bit warning. diff --git a/harbour/contrib/hbmzip/ioapi.c b/harbour/contrib/hbmzip/ioapi.c index 0a731a1b78..b26153f8a0 100644 --- a/harbour/contrib/hbmzip/ioapi.c +++ b/harbour/contrib/hbmzip/ioapi.c @@ -10,6 +10,7 @@ #include #include +#include "hbapifs.h" #include "hbzlib.h" #include "ioapi.h" @@ -85,7 +86,7 @@ voidpf ZCALLBACK fopen_file_func ( mode_fopen = "wb"; if ((filename!=NULL) && (mode_fopen != NULL)) - file = fopen(filename, mode_fopen); + file = hb_fopen(filename, mode_fopen); return file; } diff --git a/harbour/contrib/xhb/dirrec.prg b/harbour/contrib/xhb/dirrec.prg index b3832a1254..f40825b220 100644 --- a/harbour/contrib/xhb/dirrec.prg +++ b/harbour/contrib/xhb/dirrec.prg @@ -77,7 +77,9 @@ FUNCTION DirectoryRecurse( cPath, cAttr ) hb_FNameSplit( cPath, @cFilePath, @cMask, @cExt ) cMask += cExt - + IF !ValType( cAttr ) == "C" + cAttr := "" + ENDIF /* The trick with StrTran() below if for strict xHarbour * compatibility though it should be reverted when it will * be fixed in xHarbour