EgtGeneral 2.4j1 :

- migliorato controllo bit per direttorio negli attributi di file/direttorio.
This commit is contained in:
DarioS
2022-10-20 20:01:04 +02:00
parent e9bdc5bf17
commit 080eff632c
2 changed files with 4 additions and 4 deletions
+4 -4
View File
@@ -169,7 +169,7 @@ FindFirstFileEgt( const string& sFileSpec, string& sFileName)
_wfinddata_t c_file ;
if ( ( hFile = _wfindfirst( sFileSpecW.c_str(), &c_file)) != -1L) {
do {
if ( c_file.attrib != _A_SUBDIR) {
if ( ( c_file.attrib & _A_SUBDIR) == 0) {
sFileName = LPSTR( WtoA( c_file.name)) ;
_findclose( hFile) ;
errno = 0 ;
@@ -194,7 +194,7 @@ FindAllFiles( const string& sFileSpec, STRVECTOR& vsFileNames)
_wfinddata_t c_file ;
if ( ( hFile = _wfindfirst( sFileSpecW.c_str(), &c_file)) != -1L) {
do {
if ( c_file.attrib != _A_SUBDIR)
if ( ( c_file.attrib & _A_SUBDIR) == 0)
vsFileNames.emplace_back( LPSTR( WtoA( c_file.name))) ;
} while( _wfindnext( hFile, &c_file) == 0) ;
_findclose( hFile) ;
@@ -277,7 +277,7 @@ EmptyDirectory( const string& sDir)
intptr_t hFile ;
if ( ( hFile = _wfindfirst( sFileW.c_str(), &c_file)) != -1L) {
do {
if ( c_file.attrib != _A_SUBDIR) {
if ( ( c_file.attrib & _A_SUBDIR) == 0) {
sFileW = sDirW + L"\\" + c_file.name ;
::DeleteFileW( sFileW.c_str()) ;
}
@@ -308,7 +308,7 @@ FindAllDirectories( const string& sDirSpec, STRVECTOR& vsDirNames)
_wfinddata_t c_file ;
if ( ( hFile = _wfindfirst( sDirSpecW.c_str(), &c_file)) != -1L) {
do {
if ( c_file.attrib == _A_SUBDIR) {
if ( ( c_file.attrib & _A_SUBDIR) != 0) {
string sDir = LPSTR( WtoA( c_file.name)) ;
if ( ! EqualNoCase( sDir, ".") && ! EqualNoCase( sDir, ".."))
vsDirNames.emplace_back( sDir) ;