diff options
| author | Ivan Shatsky <root@free-tier-instance.us-west1-b.c.neural-map-305409.internal> | 2022-11-09 18:13:45 +0300 |
|---|---|---|
| committer | Ivan Shatsky <root@free-tier-instance.us-west1-b.c.neural-map-305409.internal> | 2022-11-09 18:13:45 +0300 |
| commit | 29b561259c811da473541b0ce18830aa27d3d262 (patch) | |
| tree | f9e8259573569292b85d8ea1e247342685622080 /far2l/src/mix | |
| parent | 7aa83aab0760925946acfc9b50699c5c7ec7c6c4 (diff) | |
Fixing recognition of pipe character as include/exclude file masks delimiter
Backported from https://github.com/shmuz/far2l/commit/1ddb8a79d6dbc204e2f4564b3c4c551ddb3447dc
Diffstat (limited to 'far2l/src/mix')
| -rw-r--r-- | far2l/src/mix/processname.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/far2l/src/mix/processname.cpp b/far2l/src/mix/processname.cpp index 64c28f9f..2cbaafbb 100644 --- a/far2l/src/mix/processname.cpp +++ b/far2l/src/mix/processname.cpp @@ -37,6 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "processname.hpp" #include "strmix.hpp" #include "pathmix.hpp" +#include "CFileMask.hpp" // обработать имя файла: сравнить с маской, масками, сгенерировать по маске int WINAPI ProcessName(const wchar_t *param1, wchar_t *param2, DWORD size, DWORD flags) @@ -50,21 +51,8 @@ int WINAPI ProcessName(const wchar_t *param1, wchar_t *param2, DWORD size, DWORD if (flags == PN_CMPNAMELIST) { - int Found=FALSE; - FARString strFileMask; - const wchar_t *MaskPtr; - MaskPtr=param1; - - while ((MaskPtr=GetCommaWord(MaskPtr,strFileMask))) - { - if (CmpName(strFileMask,param2,skippath)) - { - Found=TRUE; - break; - } - } - - return Found; + CFileMask Masks; + return Masks.Set(param1,FMF_SILENT) && Masks.Compare(skippath ? PointToName(param2):param2); } if (flags&PN_GENERATENAME) |