From f9898b072f6601d14b11221e3a963e980fef0189 Mon Sep 17 00:00:00 2001 From: Luiz Rafael Culik Date: Mon, 7 Jan 2002 21:37:40 +0000 Subject: [PATCH] See changelog 2002-01-07 19:40 UTC -0300 --- harbour/ChangeLog | 6 ++++++ harbour/source/common/hbffind.c | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 58de11098b..982a03ab96 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,12 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + just include -DHB_EOL_CRLF in the C_USR environment variable and + rebuild Harbour. + +2002-01-08 17:10 UTC-0500 David G. Holm + * source/rtl/isprint.c + ! Added a missing __RSXNT__ guard on an HB_OS_WIN_32 check. 2002-01-08 09:52 UTC+0100 Patrick Mast * source/compiler/genc.c diff --git a/harbour/source/common/hbffind.c b/harbour/source/common/hbffind.c index fb6170e1b5..c6639836a9 100644 --- a/harbour/source/common/hbffind.c +++ b/harbour/source/common/hbffind.c @@ -211,12 +211,14 @@ ULONG hb_fsAttrToRaw( USHORT uiAttr ) #elif defined(HB_OS_WIN_32) raw_attr = 0; + if( uiAttr & HB_FA_ARCHIVE ) raw_attr |= FILE_ATTRIBUTE_ARCHIVE; if( uiAttr & HB_FA_DIRECTORY ) raw_attr |= FILE_ATTRIBUTE_DIRECTORY; if( uiAttr & HB_FA_HIDDEN ) raw_attr |= FILE_ATTRIBUTE_HIDDEN; if( uiAttr & HB_FA_READONLY ) raw_attr |= FILE_ATTRIBUTE_READONLY; if( uiAttr & HB_FA_SYSTEM ) raw_attr |= FILE_ATTRIBUTE_SYSTEM; if( uiAttr & HB_FA_NORMAL ) raw_attr |= FILE_ATTRIBUTE_NORMAL; + #elif defined(HB_OS_UNIX) raw_attr = 0; @@ -296,6 +298,7 @@ char * hb_fsAttrDecode( USHORT uiAttr, char * szAttr ) if( uiAttr & HB_FA_LABEL ) *ptr++ = 'V'; if( uiAttr & HB_FA_DIRECTORY ) *ptr++ = 'D'; if( uiAttr & HB_FA_ARCHIVE ) *ptr++ = 'A'; + if( uiAttr & HB_FA_NORMAL ) *ptr++ = ' '; #ifdef HB_EXTENSION if( uiAttr & HB_FA_DEVICE ) *ptr++ = 'I'; if( uiAttr & HB_FA_TEMPORARY ) *ptr++ = 'T'; @@ -561,7 +564,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr ) if( info->hFindFile != INVALID_HANDLE_VALUE ) { - if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) ) + if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->dwAttr & HB_FA_NORMAL )) { bFound = TRUE; } @@ -571,7 +574,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr ) while( FindNextFile( info->hFindFile, &info->pFindFileData ) ) { - if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) ) + if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->dwAttr & HB_FA_NORMAL ) ) { bFound = TRUE; break; @@ -666,7 +669,7 @@ BOOL hb_fsFindNext( PHB_FFIND ffind ) while( FindNextFile( info->hFindFile, &info->pFindFileData ) ) { - if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) ) + if( info->dwAttr == 0 || ( info->dwAttr & info->pFindFileData.dwFileAttributes ) || ( info->dwAttr & HB_FA_NORMAL )) { bFound = TRUE; break;