@@ -34,7 +34,7 @@ bool Archive::GetComment(Array<wchar> *CmtData)

 #ifndef SFX_MODULE

     // Old style (RAR 2.9) comment header embedded into the main 

     // archive header.

-    if (BrokenHeader)

+    if (BrokenHeader || CommHead.HeadSize<SIZEOF_COMMHEAD)

     {

       uiMsg(UIERROR_CMTBROKEN,FileName);

       return false;

@@ -57,6 +57,8 @@ bool Archive::GetComment(Array<wchar> *CmtData)

 #else

       UnpCmtLength=GetByte();

       UnpCmtLength+=(GetByte()<<8);

+      if (CmtLength<2)

+        return false;

       CmtLength-=2;

       DataIO.SetCmt13Encryption();

       CommHead.UnpVer=15;

@@ -85,15 +87,18 @@ bool Archive::GetComment(Array<wchar> *CmtData)

       byte *UnpData;

       size_t UnpDataSize;

       DataIO.GetUnpackedData(&UnpData,&UnpDataSize);

+      if (UnpDataSize>0)

+      {

 #ifdef _WIN_ALL

-      // If we ever decide to extend it to Android, we'll need to alloc

-      // 4x memory for OEM to UTF-8 output here.

-      OemToCharBuffA((char *)UnpData,(char *)UnpData,(DWORD)UnpDataSize);

+        // If we ever decide to extend it to Android, we'll need to alloc

+        // 4x memory for OEM to UTF-8 output here.

+        OemToCharBuffA((char *)UnpData,(char *)UnpData,(DWORD)UnpDataSize);

 #endif

-      CmtData->Alloc(UnpDataSize+1);

-      memset(CmtData->Addr(0),0,CmtData->Size()*sizeof(wchar));

-      CharToWide((char *)UnpData,CmtData->Addr(0),CmtData->Size());

-      CmtData->Alloc(wcslen(CmtData->Addr(0)));

+        CmtData->Alloc(UnpDataSize+1);

+        memset(CmtData->Addr(0),0,CmtData->Size()*sizeof(wchar));

+        CharToWide((char *)UnpData,CmtData->Addr(0),CmtData->Size());

+        CmtData->Alloc(wcslen(CmtData->Addr(0)));

+      }

     }

   }

   else

@@ -37,8 +37,7 @@ class Archive:public File

     void RequestArcPassword();

     void UnexpEndArcMsg();

     void BrokenHeaderMsg();

-    void UnkEncVerMsg(const wchar *Name);

-    void UnkEncVerMsg();

+    void UnkEncVerMsg(const wchar *Name,const wchar *Info);

     bool ReadCommentData(Array<wchar> *CmtData);

 #if !defined(RAR_NOCRYPT)

@@ -85,7 +84,7 @@ class Archive:public File

     void AddSubData(byte *SrcData,uint64 DataSize,File *SrcFile,

          const wchar *Name,uint Flags);

     bool ReadSubData(Array<byte> *UnpData,File *DestFile);

-    HEADER_TYPE GetHeaderType() {return CurHeaderType;};

+    HEADER_TYPE GetHeaderType() {return CurHeaderType;}

     RAROptions* GetRAROptions() {return Cmd;}

     void SetSilentOpen(bool Mode) {SilentOpen=Mode;}

 #if 0

@@ -10,7 +10,10 @@ size_t Archive::ReadHeader()

   CurBlockPos=Tell();

-  size_t ReadSize;

+  // Other developers asked us to initialize it to suppress "may be used

+  // uninitialized" warning in code below in some compilers.

+  size_t ReadSize=0;

+

   switch(Format)

   {

 #ifndef SFX_MODULE

@@ -113,9 +116,9 @@ void Archive::BrokenHeaderMsg()

 }

-void Archive::UnkEncVerMsg(const wchar *Name)

+void Archive::UnkEncVerMsg(const wchar *Name,const wchar *Info)

 {

-  uiMsg(UIERROR_UNKNOWNENCMETHOD,FileName,Name);

+  uiMsg(UIERROR_UNKNOWNENCMETHOD,FileName,Name,Info);

   ErrHandler.SetErrorCode(RARX_WARNING);

 }

@@ -201,7 +204,7 @@ size_t Archive::ReadHeader15()

     if (ShortBlock.HeaderType==HEAD_MAIN && (ShortBlock.Flags & MHD_COMMENT)!=0)

     {

       // Old style (up to RAR 2.9) main archive comment embedded into

-      // the main archive header found. While we can read the entire 

+      // the main archive header found. While we can read the entire

       // ShortBlock.HeadSize here and remove this part of "if", it would be

       // waste of memory, because we'll read and process this comment data

       // in other function anyway and we do not need them here now.

@@ -227,7 +230,7 @@ size_t Archive::ReadHeader15()

       Encrypted=(MainHead.Flags & MHD_PASSWORD)!=0;

       Signed=MainHead.PosAV!=0 || MainHead.HighPosAV!=0;

       MainHead.CommentInHeader=(MainHead.Flags & MHD_COMMENT)!=0;

-    

+

       // Only for encrypted 3.0+ archives. 2.x archives did not have this

       // flag, so for non-encrypted archives, we'll set it later based on

       // file attributes.

@@ -254,7 +257,7 @@ size_t Archive::ReadHeader15()

         hd->WinSize=hd->Dir ? 0:0x10000<<((hd->Flags & LHD_WINDOWMASK)>>5);

         hd->CommentInHeader=(hd->Flags & LHD_COMMENT)!=0;

         hd->Version=(hd->Flags & LHD_VERSION)!=0;

-        

+

         hd->DataSize=Raw.Get4();

         uint LowUnpSize=Raw.Get4();

         hd->HostOS=Raw.Get1();

@@ -279,7 +282,7 @@ size_t Archive::ReadHeader15()

           {

             case 13: hd->CryptMethod=CRYPT_RAR13; break;

             case 15: hd->CryptMethod=CRYPT_RAR15; break;

-            case 20: 

+            case 20:

             case 26: hd->CryptMethod=CRYPT_RAR20; break;

             default: hd->CryptMethod=CRYPT_RAR30; break;

           }

@@ -301,7 +304,7 @@ size_t Archive::ReadHeader15()

         }

         hd->Inherited=!FileBlock && (hd->SubFlags & SUBHEAD_FLAGS_INHERITED)!=0;

-        

+

         hd->LargeFile=(hd->Flags & LHD_LARGE)!=0;

         uint HighPackSize,HighUnpSize;

@@ -311,7 +314,7 @@ size_t Archive::ReadHeader15()

           HighUnpSize=Raw.Get4();

           hd->UnknownUnpSize=(LowUnpSize==0xffffffff && HighUnpSize==0xffffffff);

         }

-        else 

+        else

         {

           HighPackSize=HighUnpSize=0;

           // UnpSize equal to 0xffffffff without LHD_LARGE flag indicates

@@ -506,7 +509,7 @@ size_t Archive::ReadHeader15()

         NextBlockPos+=Raw.Get4();

       break;

   }

-  

+

   ushort HeaderCRC=Raw.GetCRC15(false);

   // Old AV header does not have header CRC properly set.

@@ -566,7 +569,7 @@ size_t Archive::ReadHeader50()

     // We repeat the password request only for manually entered passwords

     // and not for -p<pwd>. Wrong password can be intentionally provided

     // in -p<pwd> to not stop batch processing for encrypted archives.

-    bool GlobalPassword=Cmd->Password.IsSet();

+    bool GlobalPassword=Cmd->Password.IsSet() || uiIsGlobalPasswordSet();

     while (true) // Repeat the password prompt for wrong passwords.

     {

@@ -641,7 +644,7 @@ size_t Archive::ReadHeader50()

     BrokenHeaderMsg();

     return 0;

   }

-  

+

   Raw.Read(SizeToRead);

   if (Raw.Size()<HeaderSize)

@@ -674,7 +677,7 @@ size_t Archive::ReadHeader50()

       return 0;

     }

   }

-  

+

   uint64 ExtraSize=0;

   if ((ShortBlock.Flags & HFL_EXTRA)!=0)

   {

@@ -702,7 +705,9 @@ size_t Archive::ReadHeader50()

         uint CryptVersion=(uint)Raw.GetV();

         if (CryptVersion>CRYPT_VERSION)

         {

-          UnkEncVerMsg(FileName);

+          wchar Info[20];

+          swprintf(Info,ASIZE(Info),L"h%u",CryptVersion);

+          UnkEncVerMsg(FileName,Info);

           return 0;

         }

         uint EncFlags=(uint)Raw.GetV();

@@ -710,7 +715,9 @@ size_t Archive::ReadHeader50()

         CryptHead.Lg2Count=Raw.Get1();

         if (CryptHead.Lg2Count>CRYPT5_KDF_LG2_COUNT_MAX)

         {

-          UnkEncVerMsg(FileName);

+          wchar Info[20];

+          swprintf(Info,ASIZE(Info),L"hc%u",CryptHead.Lg2Count);

+          UnkEncVerMsg(FileName,Info);

           return 0;

         }

         Raw.GetB(CryptHead.Salt,SIZE_SALT50);

@@ -763,7 +770,7 @@ size_t Archive::ReadHeader50()

           // to not break normal archive processing by calling function.

           int64 SaveCurBlockPos=CurBlockPos,SaveNextBlockPos=NextBlockPos;

           HEADER_TYPE SaveCurHeaderType=CurHeaderType;

-          

+

           QOpen.Init(this,false);

           QOpen.Load(MainHead.QOpenOffset);

@@ -788,7 +795,7 @@ size_t Archive::ReadHeader50()

         hd->PackSize=DataSize;

         hd->FileFlags=(uint)Raw.GetV();

         hd->UnpSize=Raw.GetV();

-        

+

         hd->UnknownUnpSize=(hd->FileFlags & FHFL_UNPUNKNOWN)!=0;

         if (hd->UnknownUnpSize)

           hd->UnpSize=INT64NDF;

@@ -815,6 +822,8 @@ size_t Archive::ReadHeader50()

         // but it was already used in RAR 1.5 and Unpack needs to distinguish

         // them.

         hd->UnpVer=(CompInfo & 0x3f) + 50;

+        if (hd->UnpVer!=50) // Only 5.0 compression is known now.

+          hd->UnpVer=VER_UNKNOWN;

         hd->HostOS=(byte)Raw.GetV();

         size_t NameSize=(size_t)Raw.GetV();

@@ -873,7 +882,7 @@ size_t Archive::ReadHeader50()

           RecoverySize=Header.RecSectionSize*Header.RecCount;

         }

 #endif

-          

+

         if (BadCRC) // Add the file name to broken header message displayed above.

           uiMsg(UIERROR_FHEADERBROKEN,Archive::FileName,hd->FileName);

       }

@@ -989,8 +998,12 @@ void Archive::ProcessExtra50(RawRead *Raw,size_t ExtraSize,BaseBlock *bb)

           {

             FileHeader *hd=(FileHeader *)bb;

             uint EncVersion=(uint)Raw->GetV();

-            if (EncVersion > CRYPT_VERSION)

-              UnkEncVerMsg(hd->FileName);

+            if (EncVersion>CRYPT_VERSION)

+            {

+              wchar Info[20];

+              swprintf(Info,ASIZE(Info),L"x%u",EncVersion);

+              UnkEncVerMsg(hd->FileName,Info);

+            }

             else

             {

               uint Flags=(uint)Raw->GetV();

@@ -998,7 +1011,11 @@ void Archive::ProcessExtra50(RawRead *Raw,size_t ExtraSize,BaseBlock *bb)

               hd->UseHashKey=(Flags & FHEXTRA_CRYPT_HASHMAC)!=0;

               hd->Lg2Count=Raw->Get1();

               if (hd->Lg2Count>CRYPT5_KDF_LG2_COUNT_MAX)

-                UnkEncVerMsg(hd->FileName);

+              {

+                wchar Info[20];

+                swprintf(Info,ASIZE(Info),L"xc%u",hd->Lg2Count);

+                UnkEncVerMsg(hd->FileName,Info);

+              }

               Raw->GetB(hd->Salt,SIZE_SALT50);

               Raw->GetB(hd->InitV,SIZE_INITV);

               if (hd->UsePswCheck)

@@ -1290,7 +1307,7 @@ void Archive::ConvertAttributes()

   if (mask == (mode_t) -1)

   {

-    // umask call returns the current umask value. Argument (022) is not 

+    // umask call returns the current umask value. Argument (022) is not

     // really important here.

     mask = umask(022);

@@ -1367,8 +1384,8 @@ void Archive::ConvertFileHeader(FileHeader *hd)

     // ':' in file names is allowed in Unix, but not in Windows.

     // Even worse, file data will be written to NTFS stream on NTFS,

-    // so automatic name correction on file create error in extraction 

-    // routine does not work. In Windows and DOS versions we better 

+    // so automatic name correction on file create error in extraction

+    // routine does not work. In Windows and DOS versions we better

     // replace ':' now.

     if (*s==':')

       *s='_';

@@ -1,5 +1,8 @@

 #include "rar.hpp"

+#include "cmdfilter.cpp"

+#include "cmdmix.cpp"

+

 CommandData::CommandData()

 {

   Init();

@@ -120,6 +123,7 @@ void CommandData::ParseArg(wchar *Arg)

         wchar CmdChar=toupperw(*Command);

         bool Add=wcschr(L"AFUM",CmdChar)!=NULL;

         bool Extract=CmdChar=='X' || CmdChar=='E';

+        bool Repair=CmdChar=='R' && Command[1]==0;

         if (EndSeparator && !Add)

           wcsncpyz(ExtrPath,Arg,ASIZE(ExtrPath));

         else

@@ -130,15 +134,15 @@ void CommandData::ParseArg(wchar *Arg)

             FindData FileData;

             bool Found=FindFile::FastFind(Arg,&FileData);

             if ((!Found || ListMode==RCLM_ACCEPT_LISTS) && 

-                ListMode!=RCLM_REJECT_LISTS && *Arg=='@' && !IsWildcard(Arg))

+                ListMode!=RCLM_REJECT_LISTS && *Arg=='@' && !IsWildcard(Arg+1))

             {

               FileLists=true;

               ReadTextFile(Arg+1,&FileArgs,false,true,FilelistCharset,true,true,true);

             }

-            else

-              if (Found && FileData.IsDir && Extract && *ExtrPath==0)

+            else // We use 'destpath\' when extracting and reparing.

+              if (Found && FileData.IsDir && (Extract || Repair) && *ExtrPath==0)

               {

                 wcsncpyz(ExtrPath,Arg,ASIZE(ExtrPath));

                 AddEndSlash(ExtrPath,ASIZE(ExtrPath));

@@ -280,7 +284,11 @@ void CommandData::ProcessSwitch(const wchar *Switch)

           ClearArc=true;

           break;

         case 'D':

-          AppendArcNameToPath=true;

+          if (Switch[2]==0)

+            AppendArcNameToPath=APPENDARCNAME_DESTPATH;

+          else

+            if (Switch[2]=='1')

+              AppendArcNameToPath=APPENDARCNAME_OWNDIR;

           break;

 #ifndef SFX_MODULE

         case 'G':

@@ -302,7 +310,7 @@ void CommandData::ProcessSwitch(const wchar *Switch)

           AddArcOnly=true;

           break;

         case 'P':

-          wcscpy(ArcPath,Switch+2);

+          wcsncpyz(ArcPath,Switch+2,ASIZE(ArcPath));

           break;

         case 'S':

           SyncFiles=true;

@@ -407,9 +415,9 @@ void CommandData::ProcessSwitch(const wchar *Switch)

         wcsncpyz(LogName,Switch[4]!=0 ? Switch+4:DefLogName,ASIZE(LogName));

         break;

       }

-      if (wcsicomp(Switch+1,L"SND")==0)

+      if (wcsnicomp(Switch+1,L"SND",3)==0)

       {

-        Sound=true;

+        Sound=Switch[4]=='-' ? SOUND_NOTIFY_OFF : SOUND_NOTIFY_ON;

         break;

       }

       if (wcsicomp(Switch+1,L"ERR")==0)

@@ -805,16 +813,16 @@ void CommandData::ProcessSwitch(const wchar *Switch)

           ArcTime=ARCTIME_LATEST;

           break;

         case 'O':

-          FileTimeBefore.SetAgeText(Switch+2);

+          SetTimeFilters(Switch+2,true,true);

           break;

         case 'N':

-          FileTimeAfter.SetAgeText(Switch+2);

+          SetTimeFilters(Switch+2,false,true);

           break;

         case 'B':

-          FileTimeBefore.SetIsoText(Switch+2);

+          SetTimeFilters(Switch+2,true,false);

           break;

         case 'A':

-          FileTimeAfter.SetIsoText(Switch+2);

+          SetTimeFilters(Switch+2,false,false);

           break;

         case 'S':

           {

@@ -897,7 +905,7 @@ void CommandData::ProcessSwitch(const wchar *Switch)

       if (Switch[1]==0)

       {

         // If comment file is not specified, we read data from stdin.

-        wcscpy(CommentFile,L"stdin");

+        wcsncpyz(CommentFile,L"stdin",ASIZE(CommentFile));

       }

       else

         wcsncpyz(CommentFile,Switch+1,ASIZE(CommentFile));

@@ -922,309 +930,6 @@ void CommandData::BadSwitch(const wchar *Switch)

 #endif

-void CommandData::OutTitle()

-{

-  if (BareOutput || DisableCopyright)

-    return;

-#if defined(__GNUC__) && defined(SFX_MODULE)

-  mprintf(St(MCopyrightS));

-#else

-#ifndef SILENT

-  static bool TitleShown=false;

-  if (TitleShown)

-    return;

-  TitleShown=true;

-

-  wchar Version[80];

-  if (RARVER_BETA!=0)

-    swprintf(Version,ASIZE(Version),L"%d.%02d %ls %d",RARVER_MAJOR,RARVER_MINOR,St(MBeta),RARVER_BETA);

-  else

-    swprintf(Version,ASIZE(Version),L"%d.%02d",RARVER_MAJOR,RARVER_MINOR);

-#if defined(_WIN_32) || defined(_WIN_64)

-  wcsncatz(Version,L" ",ASIZE(Version));

-#endif

-#ifdef _WIN_32

-  wcsncatz(Version,St(Mx86),ASIZE(Version));

-#endif

-#ifdef _WIN_64

-  wcsncatz(Version,St(Mx64),ASIZE(Version));

-#endif

-  if (PrintVersion)

-  {

-    mprintf(L"%s",Version);

-    exit(0);

-  }

-  mprintf(St(MUCopyright),Version,RARVER_YEAR);

-#endif

-#endif

-}

-

-

-inline bool CmpMSGID(MSGID i1,MSGID i2)

-{

-#ifdef MSGID_INT

-  return i1==i2;

-#else

-  // If MSGID is const char*, we cannot compare pointers only.

-  // Pointers to different instances of same string can differ,

-  // so we need to compare complete strings.

-  return wcscmp(i1,i2)==0;

-#endif

-}

-

-void CommandData::OutHelp(RAR_EXIT ExitCode)

-{

-#if !defined(SILENT)

-  OutTitle();

-  static MSGID Help[]={

-#ifdef SFX_MODULE

-    // Console SFX switches definition.

-    MCHelpCmd,MSHelpCmdE,MSHelpCmdT,MSHelpCmdV

-#else

-    // UnRAR switches definition.

-    MUNRARTitle1,MRARTitle2,MCHelpCmd,MCHelpCmdE,MCHelpCmdL,

-    MCHelpCmdP,MCHelpCmdT,MCHelpCmdV,MCHelpCmdX,MCHelpSw,MCHelpSwm,

-    MCHelpSwAT,MCHelpSwAC,MCHelpSwAD,MCHelpSwAG,MCHelpSwAI,MCHelpSwAP,

-    MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,

-    MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR,

-    MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwN,MCHelpSwNa,MCHelpSwNal,

-    MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOW,MCHelpSwP,

-    MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSC,MCHelpSwSL,MCHelpSwSM,

-    MCHelpSwTA,MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,

-    MCHelpSwVUnr,MCHelpSwVER,MCHelpSwVP,MCHelpSwX,MCHelpSwXa,MCHelpSwXal,

-    MCHelpSwY

-#endif

-  };

-

-  for (uint I=0;I<ASIZE(Help);I++)

-  {

-#ifndef SFX_MODULE

-    if (CmpMSGID(Help[I],MCHelpSwV))

-      continue;

-#ifndef _WIN_ALL

-    static MSGID Win32Only[]={

-      MCHelpSwIEML,MCHelpSwVD,MCHelpSwAO,MCHelpSwOS,MCHelpSwIOFF,

-      MCHelpSwEP2,MCHelpSwOC,MCHelpSwONI,MCHelpSwDR,MCHelpSwRI

-    };

-    bool Found=false;

-    for (int J=0;J<sizeof(Win32Only)/sizeof(Win32Only[0]);J++)

-      if (CmpMSGID(Help[I],Win32Only[J]))

-      {

-        Found=true;

-        break;

-      }

-    if (Found)

-      continue;

-#endif

-#if !defined(_UNIX) && !defined(_WIN_ALL)

-    if (CmpMSGID(Help[I],MCHelpSwOW))

-      continue;

-#endif

-#if !defined(_WIN_ALL) && !defined(_EMX)

-    if (CmpMSGID(Help[I],MCHelpSwAC))

-      continue;

-#endif

-#ifndef SAVE_LINKS

-    if (CmpMSGID(Help[I],MCHelpSwOL))

-      continue;

-#endif

-#ifndef RAR_SMP

-    if (CmpMSGID(Help[I],MCHelpSwMT))

-      continue;

-#endif

-#endif

-    mprintf(St(Help[I]));

-  }

-  mprintf(L"\n");

-  ErrHandler.Exit(ExitCode);

-#endif

-}

-

-

-// Return 'true' if we need to exclude the file from processing as result

-// of -x switch. If CheckInclList is true, we also check the file against

-// the include list created with -n switch.

-bool CommandData::ExclCheck(const wchar *CheckName,bool Dir,bool CheckFullPath,bool CheckInclList)

-{

-  if (CheckArgs(&ExclArgs,Dir,CheckName,CheckFullPath,MATCH_WILDSUBPATH))

-    return true;

-  if (!CheckInclList || InclArgs.ItemsCount()==0)

-    return false;

-  if (CheckArgs(&InclArgs,Dir,CheckName,CheckFullPath,MATCH_WILDSUBPATH))

-    return false;

-  return true;

-}

-

-

-bool CommandData::CheckArgs(StringList *Args,bool Dir,const wchar *CheckName,bool CheckFullPath,int MatchMode)

-{

-  wchar *Name=ConvertPath(CheckName,NULL);

-  wchar FullName[NM];

-  wchar CurMask[NM];

-  *FullName=0;

-  Args->Rewind();

-  while (Args->GetString(CurMask,ASIZE(CurMask)))

-  {

-    wchar *LastMaskChar=PointToLastChar(CurMask);

-    bool DirMask=IsPathDiv(*LastMaskChar); // Mask for directories only.

-

-    if (Dir)

-    {

-      // CheckName is a directory.

-      if (DirMask)

-      {

-        // We process the directory and have the directory exclusion mask.

-        // So let's convert "mask\" to "mask" and process it normally.

-        

-        *LastMaskChar=0;

-      }

-      else

-      {

-        // REMOVED, we want -npath\* to match empty folders too.

-        // If mask has wildcards in name part and does not have the trailing

-        // '\' character, we cannot use it for directories.

-      

-        // if (IsWildcard(PointToName(CurMask)))

-        //  continue;

-      }

-    }

-    else

-    {

-      // If we process a file inside of directory excluded by "dirmask\".

-      // we want to exclude such file too. So we convert "dirmask\" to

-      // "dirmask\*". It is important for operations other than archiving

-      // with -x. When archiving with -x, directory matched by "dirmask\"

-      // is excluded from further scanning.

-

-      if (DirMask)

-        wcsncatz(CurMask,L"*",ASIZE(CurMask));

-    }

-

-#ifndef SFX_MODULE

-    if (CheckFullPath && IsFullPath(CurMask))

-    {

-      // We do not need to do the special "*\" processing here, because

-      // unlike the "else" part of this "if", now we convert names to full

-      // format, so they all include the path, which is matched by "*\"

-      // correctly. Moreover, removing "*\" from mask would break

-      // the comparison, because now all names have the path.

-

-      if (*FullName==0)

-        ConvertNameToFull(CheckName,FullName,ASIZE(FullName));

-      if (CmpName(CurMask,FullName,MatchMode))

-        return true;

-    }

-    else

-#endif

-    {

-      wchar NewName[NM+2],*CurName=Name;

-

-      // Important to convert before "*\" check below, so masks like

-      // d:*\something are processed properly.

-      wchar *CmpMask=ConvertPath(CurMask,NULL);

-

-      if (CmpMask[0]=='*' && IsPathDiv(CmpMask[1]))

-      {

-        // We want "*\name" to match 'name' not only in subdirectories,

-        // but also in the current directory. We convert the name

-        // from 'name' to '.\name' to be matched by "*\" part even if it is

-        // in current directory.

-        NewName[0]='.';

-        NewName[1]=CPATHDIVIDER;

-        wcsncpyz(NewName+2,Name,ASIZE(NewName)-2);

-        CurName=NewName;

-      }

-

-      if (CmpName(CmpMask,CurName,MatchMode))

-        return true;

-    }

-  }

-  return false;

-}

-

-

-#ifndef SFX_MODULE

-// Now this function performs only one task and only in Windows version:

-// it skips symlinks to directories if -e1024 switch is specified.

-// Symlinks are skipped in ScanTree class, so their entire contents

-// is skipped too. Without this function we would check the attribute

-// only directly before archiving, so we would skip the symlink record,

-// but not the contents of symlinked directory.

-bool CommandData::ExclDirByAttr(uint FileAttr)

-{

-#ifdef _WIN_ALL

-  if ((FileAttr & FILE_ATTRIBUTE_REPARSE_POINT)!=0 &&

-      (ExclFileAttr & FILE_ATTRIBUTE_REPARSE_POINT)!=0)

-    return true;

-#endif

-  return false;

-}

-#endif

-

-

-

-

-#ifndef SFX_MODULE

-// Return 'true' if we need to exclude the file from processing.

-bool CommandData::TimeCheck(RarTime &ft)

-{

-  if (FileTimeBefore.IsSet() && ft>=FileTimeBefore)

-    return true;

-  if (FileTimeAfter.IsSet() && ft<=FileTimeAfter)

-    return true;

-  return false;

-}

-#endif

-

-

-#ifndef SFX_MODULE

-// Return 'true' if we need to exclude the file from processing.

-bool CommandData::SizeCheck(int64 Size)

-{

-  if (FileSizeLess!=INT64NDF && Size>=FileSizeLess)

-    return(true);

-  if (FileSizeMore!=INT64NDF && Size<=FileSizeMore)

-    return(true);

-  return(false);

-}

-#endif

-

-

-

-

-int CommandData::IsProcessFile(FileHeader &FileHead,bool *ExactMatch,int MatchType,

-                               wchar *MatchedArg,uint MatchedArgSize)

-{

-  if (MatchedArg!=NULL && MatchedArgSize>0)

-    *MatchedArg=0;

-//  if (wcslen(FileHead.FileName)>=NM)

-//    return 0;

-  bool Dir=FileHead.Dir;

-  if (ExclCheck(FileHead.FileName,Dir,false,true))

-    return 0;

-#ifndef SFX_MODULE

-  if (TimeCheck(FileHead.mtime))

-    return 0;

-  if ((FileHead.FileAttr & ExclFileAttr)!=0 || InclAttrSet && (FileHead.FileAttr & InclFileAttr)==0)

-    return 0;

-  if (!Dir && SizeCheck(FileHead.UnpSize))

-    return 0;

-#endif

-  wchar *ArgName;

-  FileArgs.Rewind();

-  for (int StringCount=1;(ArgName=FileArgs.GetString())!=NULL;StringCount++)

-    if (CmpName(ArgName,FileHead.FileName,MatchType))

-    {

-      if (ExactMatch!=NULL)

-        *ExactMatch=wcsicompc(ArgName,FileHead.FileName)==0;

-      if (MatchedArg!=NULL)

-        wcsncpyz(MatchedArg,ArgName,MatchedArgSize);

-      return StringCount;

-    }

-  return 0;

-}

-

-

 void CommandData::ProcessCommand()

 {

 #ifndef SFX_MODULE

@@ -6,6 +6,8 @@

 enum RAR_CMD_LIST_MODE {RCLM_AUTO,RCLM_REJECT_LISTS,RCLM_ACCEPT_LISTS};

+enum IS_PROCESS_FILE_FLAGS {IPFF_EXCLUDE_PARENT=1};

+

 class CommandData:public RAROptions

 {

   private:

@@ -13,6 +15,9 @@ class CommandData:public RAROptions

     void ProcessSwitch(const wchar *Switch);

     void BadSwitch(const wchar *Switch);

     uint GetExclAttr(const wchar *Str);

+#if !defined(SFX_MODULE)

+    void SetTimeFilters(const wchar *Mod,bool Before,bool Age);

+#endif

     bool FileLists;

     bool NoMoreSwitches;

@@ -34,11 +39,11 @@ class CommandData:public RAROptions

     bool ExclCheck(const wchar *CheckName,bool Dir,bool CheckFullPath,bool CheckInclList);

     static bool CheckArgs(StringList *Args,bool Dir,const wchar *CheckName,bool CheckFullPath,int MatchMode);

     bool ExclDirByAttr(uint FileAttr);

-    bool TimeCheck(RarTime &ft);

+    bool TimeCheck(RarTime &ftm,RarTime &ftc,RarTime &fta);

     bool SizeCheck(int64 Size);

     bool AnyFiltersActive();

-    int IsProcessFile(FileHeader &FileHead,bool *ExactMatch=NULL,int MatchType=MATCH_WILDSUBPATH,

-                      wchar *MatchedArg=NULL,uint MatchedArgSize=0);

+    int IsProcessFile(FileHeader &FileHead,bool *ExactMatch,int MatchType,

+                      bool Flags,wchar *MatchedArg,uint MatchedArgSize);

     void ProcessCommand();

     void AddArcName(const wchar *Name);

     bool GetArcName(wchar *Name,int MaxSize);

new file mode 100644

@@ -0,0 +1,305 @@

+// Return 'true' if we need to exclude the file from processing as result

+// of -x switch. If CheckInclList is true, we also check the file against

+// the include list created with -n switch.

+bool CommandData::ExclCheck(const wchar *CheckName,bool Dir,bool CheckFullPath,bool CheckInclList)

+{

+  if (CheckArgs(&ExclArgs,Dir,CheckName,CheckFullPath,MATCH_WILDSUBPATH))

+    return true;

+  if (!CheckInclList || InclArgs.ItemsCount()==0)

+    return false;

+  if (CheckArgs(&InclArgs,Dir,CheckName,CheckFullPath,MATCH_WILDSUBPATH))

+    return false;

+  return true;

+}

+

+

+bool CommandData::CheckArgs(StringList *Args,bool Dir,const wchar *CheckName,bool CheckFullPath,int MatchMode)

+{

+  wchar *Name=ConvertPath(CheckName,NULL,0);

+  wchar FullName[NM];

+  wchar CurMask[NM];

+  *FullName=0;

+  Args->Rewind();

+  while (Args->GetString(CurMask,ASIZE(CurMask)))

+  {

+    wchar *LastMaskChar=PointToLastChar(CurMask);

+    bool DirMask=IsPathDiv(*LastMaskChar); // Mask for directories only.

+

+    if (Dir)

+    {

+      // CheckName is a directory.

+      if (DirMask)

+      {

+        // We process the directory and have the directory exclusion mask.

+        // So let's convert "mask\" to "mask" and process it normally.

+        

+        *LastMaskChar=0;

+      }

+      else

+      {

+        // REMOVED, we want -npath\* to match empty folders too.

+        // If mask has wildcards in name part and does not have the trailing

+        // '\' character, we cannot use it for directories.

+      

+        // if (IsWildcard(PointToName(CurMask)))

+        //  continue;

+      }

+    }

+    else

+    {

+      // If we process a file inside of directory excluded by "dirmask\".

+      // we want to exclude such file too. So we convert "dirmask\" to

+      // "dirmask\*". It is important for operations other than archiving

+      // with -x. When archiving with -x, directory matched by "dirmask\"

+      // is excluded from further scanning.

+

+      if (DirMask)

+        wcsncatz(CurMask,L"*",ASIZE(CurMask));

+    }

+

+#ifndef SFX_MODULE

+    if (CheckFullPath && IsFullPath(CurMask))

+    {

+      // We do not need to do the special "*\" processing here, because

+      // unlike the "else" part of this "if", now we convert names to full

+      // format, so they all include the path, which is matched by "*\"

+      // correctly. Moreover, removing "*\" from mask would break

+      // the comparison, because now all names have the path.

+

+      if (*FullName==0)

+        ConvertNameToFull(CheckName,FullName,ASIZE(FullName));

+      if (CmpName(CurMask,FullName,MatchMode))

+        return true;

+    }

+    else

+#endif

+    {

+      wchar NewName[NM+2],*CurName=Name;

+

+      // Important to convert before "*\" check below, so masks like

+      // d:*\something are processed properly.

+      wchar *CmpMask=ConvertPath(CurMask,NULL,0);

+

+      if (CmpMask[0]=='*' && IsPathDiv(CmpMask[1]))

+      {

+        // We want "*\name" to match 'name' not only in subdirectories,

+        // but also in the current directory. We convert the name

+        // from 'name' to '.\name' to be matched by "*\" part even if it is

+        // in current directory.

+        NewName[0]='.';

+        NewName[1]=CPATHDIVIDER;

+        wcsncpyz(NewName+2,Name,ASIZE(NewName)-2);

+        CurName=NewName;

+      }

+

+      if (CmpName(CmpMask,CurName,MatchMode))

+        return true;

+    }

+  }

+  return false;

+}

+

+

+

+

+#ifndef SFX_MODULE

+// Now this function performs only one task and only in Windows version:

+// it skips symlinks to directories if -e1024 switch is specified.

+// Symlinks are skipped in ScanTree class, so their entire contents

+// is skipped too. Without this function we would check the attribute

+// only directly before archiving, so we would skip the symlink record,

+// but not the contents of symlinked directory.

+bool CommandData::ExclDirByAttr(uint FileAttr)

+{

+#ifdef _WIN_ALL

+  if ((FileAttr & FILE_ATTRIBUTE_REPARSE_POINT)!=0 &&

+      (ExclFileAttr & FILE_ATTRIBUTE_REPARSE_POINT)!=0)

+    return true;

+#endif

+  return false;

+}

+#endif

+

+

+

+

+#if !defined(SFX_MODULE)

+void CommandData::SetTimeFilters(const wchar *Mod,bool Before,bool Age)

+{

+  bool ModeOR=false,TimeMods=false;

+  const wchar *S=Mod;

+  // Check if any 'mca' modifiers are present, set OR mode if 'o' is present,

+  // skip modifiers and set S to beginning of time string. Be sure to check

+  // *S!=0, because termination 0 is a part of string for wcschr.

+  for (;*S!=0 && wcschr(L"MCAOmcao",*S)!=NULL;S++)

+    if (*S=='o' || *S=='O')

+      ModeOR=true;

+    else

+      TimeMods=true;

+