From 080eff632c4534b45ce60679c70cb089447f9c56 Mon Sep 17 00:00:00 2001
From: DarioS <dario.sassi@egaltech.com>
Date: Thu, 20 Oct 2022 20:01:04 +0200
Subject: [PATCH] EgtGeneral 2.4j1 : - migliorato controllo bit per direttorio
 negli attributi di file/direttorio.

---
 EgtGeneral.rc | Bin 11630 -> 11638 bytes
 FileUtils.cpp |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/EgtGeneral.rc b/EgtGeneral.rc
index 817cf2720bf561fb39cf02711d31ed5a468880f2..e013a8f712263e381c9c2ff00c9e18f61ccee795 100644
GIT binary patch
delta 110
zcmaDC^(|_{H#TNN27}G3#m+NLekZImIY5wO@-I#q#;nc%1v42pH*h;KLlsyvg9TT!
Vpz^aBHwQ^Oz!YIOMMgP@3jmF-C3*k=

delta 118
zcmews^)70|H#SDg%^SteGfloDtuy(apbB#)gW=?jg1Vb!q^uY>H*q^LgB4gaBT3jW
TZq5^Sz#>t@g4Z+^<sdEqWQ!$`

diff --git a/FileUtils.cpp b/FileUtils.cpp
index 19d953c..a7dd233 100644
--- a/FileUtils.cpp
+++ b/FileUtils.cpp
@@ -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) ;