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

2008-07-22 15:07 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/contrib/hbct/files.c
  * harbour/contrib/hbmzip/hbmzip.c
    * use new hb_fs*() functions when native platform code does not exist
This commit is contained in:
Przemyslaw Czerpak
2008-07-22 13:08:22 +00:00
parent fb434be153
commit 83fbce1ea4
3 changed files with 29 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-07-22 15:07 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbct/files.c
* harbour/contrib/hbmzip/hbmzip.c
* use new hb_fs*() functions when native platform code does not exist
2008-07-22 12:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/filesys.c
* casting for DOS OpenWatcom builds and added missing header file

8
harbour/contrib/hbct/files.c
View File

@@ -353,9 +353,15 @@ HB_FUNC( SETFDATI )
return;
}
#else
{
LONG lJulian, lMillisec;
int TODO; /* To force warning */
lJulian = pDate ? hb_dateEncode( year, month, day ) : -1;
lMillisec = pTime ? hb_timeStampEncode( hour, minute, second, 0 ) : -1;
hb_retl( hb_fsSetFileTime( ( BYTE * ) szFile, lJulian, lMillisec ) );
return;
}
#endif
}

43
harbour/contrib/hbmzip/hbmzip.c
View File

@@ -555,17 +555,21 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
fError = TRUE;
}
#elif defined( HB_OS_DOS )
# if defined(__DJGPP__) || defined(__RSX32__) || defined(__GNUC__)
{
int iAttr;
# if defined(__DJGPP__) || defined(__RSX32__) || defined(__GNUC__)
int attr;
iAttr = _chmod( szFileName, 0, 0 );
if( iAttr != -1 )
attr = _chmod( szFileName, 0, 0 );
if( attr != -1 )
#else
ULONG attr;
if( hb_fsGetAttr( ( BYTE * ) szFileName, &attr ) )
#endif
{
ulExtAttr = iAttr & ( HB_FA_READONLY | HB_FA_HIDDEN | HB_FA_SYSTEM |
ulExtAttr = attr & ( HB_FA_READONLY | HB_FA_HIDDEN | HB_FA_SYSTEM |
HB_FA_DIRECTORY | HB_FA_ARCHIVE );
if( ulExtAttr | HB_FA_READONLY )
ulExtAttr |= 0x01240000; /* r--r--r-- */
else
@@ -575,7 +579,7 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
ulExtAttr |= 0x40000000;
else
ulExtAttr |= 0x80000000;
ulLen = strlen( szZipName );
if( ulLen > 4 )
{
@@ -591,14 +595,6 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
else
fError = TRUE;
}
# else
{
int TODO; /* To force warning */
ulExtAttr = 0x81B60020; /* FILE_ATTRIBUTE_ARCHIVE | rw-rw-rw- */
}
# endif
#elif defined( HB_OS_OS2 )
{
FILESTATUS3 fs3;
@@ -631,7 +627,6 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
else
ulExtAttr |= 0x80000000;
#if 0 /* Please enable it if .exe, .bat and .com are executable files under OS2 */
ulLen = strlen( szZipName );
if( ulLen > 4 )
{
@@ -644,7 +639,6 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
ulExtAttr |= 0x00490000; /* --x--x--x */
}
}
#endif
zfi.tmz_date.tm_sec = fs3.ftimeLastWrite.twosecs * 2;
zfi.tmz_date.tm_min = fs3.ftimeLastWrite.minutes;
@@ -658,9 +652,10 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
}
#else
{
int TODO; /* To force warning */
ULONG attr;
ulExtAttr = 0x81B60020; /* FILE_ATTRIBUTE_ARCHIVE | rw-rw-rw- */
if( !hb_fsGetAttr( ( BYTE * ) szFileName, &attr ) )
ulExtAttr = 0x81B60020; /* FILE_ATTRIBUTE_ARCHIVE | rw-rw-rw- */
}
#endif
@@ -879,13 +874,9 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, char* szFileName, char* s
#elif defined( HB_OS_DOS )
# if defined(__RSX32__) || defined(__GNUC__)
{
_chmod( szName, 1, ufi.external_fa & 0xFF );
}
# else
{
int TODO; /* To force warning */
}
hb_fsSetAttr( ( BYTE * ) szName, ufi.external_fa & 0xFF );
# endif
#elif defined( HB_OS_OS2 )
@@ -927,7 +918,7 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, char* szFileName, char* s
}
#else
{
int TODO; /* To force warning */
hb_fsSetAttr( ( BYTE * ) szName, ufi.external_fa );
}
#endif