@@ -7,7 +7,7 @@ Note: This file refers to the source tarball. Things described here may differ

 ClamAV 0.102.3 is a bug patch release to address the following issues.

--

+- Updated libclamunrar to UnRAR 5.9.2.

 Special thanks to the following for code contributions and bug reports:

deleted file mode 100644

@@ -1,22 +0,0 @@

-PROJECT_NAME     = ClamAV - Libclamunrar

-OUTPUT_DIRECTORY = ../docs/libclamunrar

-WARNINGS         = YES

-FILE_PATTERNS    = *.c *.h

-PERL_PATH        = /usr/bin/perl

-SEARCHENGINE     = YES

-

-GENERATE_LATEX=NO

-OPTIMIZE_OUTPUT_FOR_C=YES

-HAVE_DOT=YES

-CALL_GRAPH=YES

-CALLER_GRAPH=YES

-JAVADOC_AUTOBRIEF=YES

-GENERATE_MAN=NO

-EXAMPLE_PATH=examples

-

-DOT_CLEANUP=NO

-MAX_DOT_GRAPH_DEPTH=3

-

-EXTRACT_ALL=YES

-INPUT = . \

-        ../shared

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

 {

   if (!MainComment)

     return false;

-  SaveFilePos SavePos(*this);

+  int64 SavePos=Tell();

+  bool Success=DoGetComment(CmtData);

+  Seek(SavePos,SEEK_SET);

+  return Success;

+}

+

+bool Archive::DoGetComment(Array<wchar> *CmtData)

+{

 #ifndef SFX_MODULE

   uint CmtLength;

   if (Format==RARFMT14)

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

 bool Archive::ReadCommentData(Array<wchar> *CmtData)

 {

   Array<byte> CmtRaw;

-  if (!ReadSubData(&CmtRaw,NULL))

+  if (!ReadSubData(&CmtRaw,NULL,false))

     return false;

   size_t CmtSize=CmtRaw.Size();

   CmtRaw.Push(0);

@@ -208,8 +208,8 @@ bool Archive::IsArchive(bool EnableBroken)

       break;

   }

-  // This check allows to make RS based recovery even if password is incorrect.

-  // But we should not do it for EnableBroken or we'll get 'not RAR archive'

+  

+  // We should not do it for EnableBroken or we'll get 'not RAR archive'

   // messages when extracting encrypted archives with wrong password.

   if (FailedHeaderDecryption && !EnableBroken)

     return false;

@@ -233,7 +233,7 @@ bool Archive::IsArchive(bool EnableBroken)

   // immediately after IsArchive call.

   if (HeadersLeft && (!SilentOpen || !Encrypted))

   {

-    SaveFilePos SavePos(*this);

+    int64 SavePos=Tell();

     int64 SaveCurBlockPos=CurBlockPos,SaveNextBlockPos=NextBlockPos;

     HEADER_TYPE SaveCurHeaderType=CurHeaderType;

@@ -262,6 +262,7 @@ bool Archive::IsArchive(bool EnableBroken)

     CurBlockPos=SaveCurBlockPos;

     NextBlockPos=SaveNextBlockPos;

     CurHeaderType=SaveCurHeaderType;

+    Seek(SavePos,SEEK_SET);

   }

   if (!Volume || FirstVolume)

     wcsncpyz(FirstVolumeName,FileName,ASIZE(FirstVolumeName));

@@ -29,7 +29,6 @@ class Archive:public File

     void UpdateLatestTime(FileHeader *CurBlock);

     void ConvertNameCase(wchar *Name);

     void ConvertFileHeader(FileHeader *hd);

-    void WriteBlock50(HEADER_TYPE HeaderType,BaseBlock *wb,bool OnlySetSize,bool NonFinalWrite);

     size_t ReadHeader14();

     size_t ReadHeader15();

     size_t ReadHeader50();

@@ -38,6 +37,7 @@ class Archive:public File

     void UnexpEndArcMsg();

     void BrokenHeaderMsg();

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

+    bool DoGetComment(Array<wchar> *CmtData);

     bool ReadCommentData(Array<wchar> *CmtData);

 #if !defined(RAR_NOCRYPT)

@@ -65,8 +65,6 @@ class Archive:public File

     size_t SearchBlock(HEADER_TYPE HeaderType);

     size_t SearchSubBlock(const wchar *Type);

     size_t SearchRR();

-    void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);

-    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}

     size_t ReadHeader();

     void CheckArc(bool EnableBroken);

     void CheckOpen(const wchar *Name);

@@ -83,7 +81,7 @@ class Archive:public File

     int64 GetStartPos();

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

          const wchar *Name,uint Flags);

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

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

     HEADER_TYPE GetHeaderType() {return CurHeaderType;}

     RAROptions* GetRAROptions() {return Cmd;}

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

deleted file mode 100644

@@ -1,67 +0,0 @@

-ArcMemory::ArcMemory()

-{

-  Loaded=false;

-  SeekPos=0;

-}

-

-

-void ArcMemory::Load(const byte *Data,size_t Size)

-{

-  ArcData.Alloc(Size);

-  memcpy(&ArcData[0],Data,Size);

-  Loaded=true;

-  SeekPos=0;

-}

-

-

-bool ArcMemory::Unload()

-{

-  if (!Loaded)

-    return false;

-  Loaded=false;

-  return true;

-}

-

-

-bool ArcMemory::Read(void *Data,size_t Size,size_t &Result)

-{

-  if (!Loaded)

-    return false;

-  Result=(size_t)Min(Size,ArcData.Size()-SeekPos);

-  memcpy(Data,&ArcData[(size_t)SeekPos],Result);

-  SeekPos+=Result;

-  return true;

-}

-

-

-bool ArcMemory::Seek(int64 Offset,int Method)

-{

-  if (!Loaded)

-    return false;

-  if (Method==SEEK_SET)

-  {

-    if (Offset<0)

-      SeekPos=0;

-    else

-      SeekPos=Min((uint64)Offset,ArcData.Size());

-  }

-  else

-    if (Method==SEEK_CUR || Method==SEEK_END)

-    {

-      if (Method==SEEK_END)

-        SeekPos=ArcData.Size();

-      SeekPos+=(uint64)Offset;

-      if (SeekPos>ArcData.Size())

-        SeekPos=Offset<0 ? 0 : ArcData.Size();

-    }

-  return true;

-}

-

-

-bool ArcMemory::Tell(int64 *Pos)

-{

-  if (!Loaded)

-    return false;

-  *Pos=SeekPos;

-  return true;

-}

deleted file mode 100644

@@ -1,22 +0,0 @@

-#ifndef _RAR_ARCMEM_

-#define _RAR_ARCMEM_

-

-// Memory interface for software fuzzers.

-

-class ArcMemory

-{

-  private:

-    bool Loaded;

-    Array<byte> ArcData;

-    uint64 SeekPos;

-  public:

-    ArcMemory();

-    void Load(const byte *Data,size_t Size);

-    bool Unload();

-    bool IsLoaded() {return Loaded;}

-    bool Read(void *Data,size_t Size,size_t &Result);

-    bool Seek(int64 Offset,int Method);

-    bool Tell(int64 *Pos);

-};

-

-#endif

@@ -268,14 +268,14 @@ size_t Archive::ReadHeader15()

         uint FileTime=Raw.Get4();

         hd->UnpVer=Raw.Get1();

-        // RAR15 did not use the special dictionary size to mark dirs.

-        if (hd->UnpVer<20 && (hd->FileAttr & 0x10)!=0)

-          hd->Dir=true;

-

         hd->Method=Raw.Get1()-0x30;

         size_t NameSize=Raw.Get2();

         hd->FileAttr=Raw.Get4();

+        // RAR15 did not use the special dictionary size to mark dirs.

+        if (hd->UnpVer<20 && (hd->FileAttr & 0x10)!=0)

+          hd->Dir=true;

+

         hd->CryptMethod=CRYPT_NONE;

         if (hd->Encrypted)

           switch(hd->UnpVer)

@@ -402,8 +402,8 @@ size_t Archive::ReadHeader15()

             if (rmode & 4)

               rlt.Second++;

             rlt.Reminder=0;

-            int count=rmode&3;

-            for (int J=0;J<count;J++)

+            uint count=rmode&3;

+            for (uint J=0;J<count;J++)

             {

               byte CurByte=Raw.Get1();

               rlt.Reminder|=(((uint)CurByte)<<((J+3-count)*8));

@@ -521,7 +521,6 @@ size_t Archive::ReadHeader15()

     {

       // Last 7 bytes of recovered volume can contain zeroes, because

       // REV files store its own information (volume number, etc.) here.

-      SaveFilePos SavePos(*this);

       int64 Length=Tell();

       Seek(Length-7,SEEK_SET);

       Recovered=true;

@@ -584,7 +583,7 @@ size_t Archive::ReadHeader50()

         {

           // This message is used by Android GUI to reset cached passwords.

           // Update appropriate code if changed.

-          uiMsg(UIERROR_BADPSW,FileName);

+          uiMsg(UIERROR_BADPSW,FileName,FileName);

           FailedHeaderDecryption=true;

           ErrHandler.SetErrorCode(RARX_BADPWD);

           return 0;

@@ -593,7 +592,7 @@ size_t Archive::ReadHeader50()

         {

           // This message is used by Android GUI and Windows GUI and SFX to

           // reset cached passwords. Update appropriate code if changed.

-          uiMsg(UIWAIT_BADPSW,FileName);

+          uiMsg(UIWAIT_BADPSW,FileName,FileName);

           Cmd->Password.Clean();

         }

@@ -720,6 +719,7 @@ size_t Archive::ReadHeader50()

           UnkEncVerMsg(FileName,Info);

           return 0;

         }

+

         Raw.GetB(CryptHead.Salt,SIZE_SALT50);

         if (CryptHead.UsePswCheck)

         {

@@ -1256,8 +1256,9 @@ size_t Archive::ReadHeader14()

     Raw.Read(NameSize);

     char FileName[NM];

-    Raw.GetB((byte *)FileName,Min(NameSize,ASIZE(FileName)));

-    FileName[NameSize]=0;

+    size_t ReadNameSize=Min(NameSize,ASIZE(FileName)-1);

+    Raw.GetB((byte *)FileName,ReadNameSize);

+    FileName[ReadNameSize]=0;

     IntToExt(FileName,FileName,ASIZE(FileName));

     CharToWide(FileName,FileHead.FileName,ASIZE(FileHead.FileName));

     ConvertNameCase(FileHead.FileName);

@@ -1414,7 +1415,7 @@ int64 Archive::GetStartPos()

 }

-bool Archive::ReadSubData(Array<byte> *UnpData,File *DestFile)

+bool Archive::ReadSubData(Array<byte> *UnpData,File *DestFile,bool TestMode)

 {

   if (BrokenHeader)

   {

@@ -1462,6 +1463,7 @@ bool Archive::ReadSubData(Array<byte> *UnpData,File *DestFile)

   SubDataIO.SetPackedSizeToRead(SubHead.PackSize);

   SubDataIO.EnableShowProgress(false);

   SubDataIO.SetFiles(this,DestFile);

+  SubDataIO.SetTestMode(TestMode);

   SubDataIO.UnpVolume=SubHead.SplitAfter;

   SubDataIO.SetSubHeader(&SubHead,NULL);

   Unpack.SetDestSize(SubHead.UnpSize);

@@ -3,6 +3,7 @@

 #define _RAR_BLAKE2_

 #define BLAKE2_DIGEST_SIZE 32

+#define BLAKE2_THREADS_NUMBER 8

 enum blake2s_constant

 {

@@ -295,10 +295,13 @@ void CommandData::ProcessSwitch(const wchar *Switch)

           if (Switch[2]=='-' && Switch[3]==0)

             GenerateArcName=0;

           else

-          {

-            GenerateArcName=true;

-            wcsncpyz(GenerateMask,Switch+2,ASIZE(GenerateMask));

-          }

+            if (toupperw(Switch[2])=='F')

+              wcsncpyz(DefGenerateMask,Switch+3,ASIZE(DefGenerateMask));

+            else

+            {

+              GenerateArcName=true;

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

+            }

           break;

 #endif

         case 'I':

@@ -373,11 +376,11 @@ void CommandData::ProcessSwitch(const wchar *Switch)

         default:

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

           {

-            InclFileAttr|=GetExclAttr(Switch+2);

+            InclFileAttr|=GetExclAttr(Switch+2,InclDir);

             InclAttrSet=true;

           }

           else

-            ExclFileAttr|=GetExclAttr(Switch+1);

+            ExclFileAttr|=GetExclAttr(Switch+1,ExclDir);

           break;

       }

       break;

@@ -825,39 +828,7 @@ void CommandData::ProcessSwitch(const wchar *Switch)

           SetTimeFilters(Switch+2,false,false);

           break;

         case 'S':

-          {

-            EXTTIME_MODE Mode=EXTTIME_HIGH3;

-            bool CommonMode=Switch[2]>='0' && Switch[2]<='4';

-            if (CommonMode)

-              Mode=(EXTTIME_MODE)(Switch[2]-'0');

-            if (Mode==EXTTIME_HIGH1 || Mode==EXTTIME_HIGH2) // '2' and '3' not supported anymore.

-              Mode=EXTTIME_HIGH3;

-            if (Switch[2]=='-')

-              Mode=EXTTIME_NONE;

-            if (CommonMode || Switch[2]=='-' || Switch[2]=='+' || Switch[2]==0)

-              xmtime=xctime=xatime=Mode;

-            else

-            {

-              if (Switch[3]>='0' && Switch[3]<='4')

-                Mode=(EXTTIME_MODE)(Switch[3]-'0');

-              if (Mode==EXTTIME_HIGH1 || Mode==EXTTIME_HIGH2) // '2' and '3' not supported anymore.

-                Mode=EXTTIME_HIGH3;

-              if (Switch[3]=='-')

-                Mode=EXTTIME_NONE;

-              switch(toupperw(Switch[2]))

-              {

-                case 'M':

-                  xmtime=Mode;

-                  break;

-                case 'C':

-                  xctime=Mode;

-                  break;

-                case 'A':

-                  xatime=Mode;

-                  break;

-              }

-            }

-          }

+          SetStoreTimeMode(Switch+2);

           break;

         case '-':

           Test=false;

@@ -960,7 +931,10 @@ void CommandData::ProcessCommand()

   if (wcschr(L"AFUMD",*Command)==NULL)

   {

     if (GenerateArcName)

-      GenerateArchiveName(ArcName,ASIZE(ArcName),GenerateMask,false);

+    {

+      const wchar *Mask=*GenerateMask!=0 ? GenerateMask:DefGenerateMask;

+      GenerateArchiveName(ArcName,ASIZE(ArcName),Mask,false);

+    }

     StringList ArcMasks;

     ArcMasks.AddString(ArcName);

@@ -979,7 +953,6 @@ void CommandData::ProcessCommand()

     case 'X':

     case 'E':

     case 'T':

-    case 'I':

       {

         CmdExtract Extract(this);

         Extract.DoExtract();

@@ -1022,7 +995,7 @@ bool CommandData::IsSwitch(int Ch)

 #ifndef SFX_MODULE

-uint CommandData::GetExclAttr(const wchar *Str)

+uint CommandData::GetExclAttr(const wchar *Str,bool &Dir)

 {

   if (IsDigit(*Str))

     return wcstol(Str,NULL,0);

@@ -1032,10 +1005,10 @@ uint CommandData::GetExclAttr(const wchar *Str)

   {

     switch(toupperw(*Str))

     {

-#ifdef _UNIX

       case 'D':

-        Attr|=S_IFDIR;

+        Dir=true;

         break;

+#ifdef _UNIX

       case 'V':

         Attr|=S_IFCHR;

         break;

@@ -1049,9 +1022,6 @@ uint CommandData::GetExclAttr(const wchar *Str)

       case 'S':

         Attr|=0x4;

         break;

-      case 'D':

-        Attr|=0x10;

-        break;

       case 'A':

         Attr|=0x20;

         break;

@@ -14,9 +14,10 @@ class CommandData:public RAROptions

     void ProcessSwitchesString(const wchar *Str);

     void ProcessSwitch(const wchar *Switch);

     void BadSwitch(const wchar *Switch);

-    uint GetExclAttr(const wchar *Str);

+    uint GetExclAttr(const wchar *Str,bool &Dir);

 #if !defined(SFX_MODULE)

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

+    void SetStoreTimeMode(const wchar *S);

 #endif

     bool FileLists;

@@ -285,7 +285,10 @@ int CommandData::IsProcessFile(FileHeader &FileHead,bool *ExactMatch,int MatchTy

 #ifndef SFX_MODULE

   if (TimeCheck(FileHead.mtime,FileHead.ctime,FileHead.atime))

     return 0;

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

+  if ((FileHead.FileAttr & ExclFileAttr)!=0 || FileHead.Dir && ExclDir)

+    return 0;

+  if (InclAttrSet && (!FileHead.Dir && (FileHead.FileAttr & InclFileAttr)==0 ||

+      FileHead.Dir && !InclDir))

     return 0;

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

     return 0;

@@ -303,3 +306,47 @@ int CommandData::IsProcessFile(FileHeader &FileHead,bool *ExactMatch,int MatchTy

     }

   return 0;

 }

+

+

+#if !defined(SFX_MODULE)

+void CommandData::SetStoreTimeMode(const wchar *S)

+{

+  if (*S==0 || IsDigit(*S) || *S=='-' || *S=='+')

+  {

+    // Apply -ts, -ts1, -ts-, -ts+ to all 3 times.

+    // Handle obsolete -ts[2,3,4] as ts+.

+    EXTTIME_MODE Mode=EXTTIME_MAX;

+    if (*S=='-')

+      Mode=EXTTIME_NONE;

+    if (*S=='1')

+      Mode=EXTTIME_1S;

+    xmtime=xctime=xatime=Mode;

+    S++;

+  }

+

+  while (*S!=0)

+  {

+    EXTTIME_MODE Mode=EXTTIME_MAX;

+    if (S[1]=='-')

+      Mode=EXTTIME_NONE;

+    if (S[1]=='1')

+      Mode=EXTTIME_1S;

+    switch(toupperw(*S))

+    {

+      case 'M':

+        xmtime=Mode;

+        break;

+      case 'C':

+        xctime=Mode;

+        break;

+      case 'A':

+        xatime=Mode;

+        break;

+      case 'P':

+        PreserveAtime=true;

+        break;

+    }

+    S++;

+  }

+}

+#endif

@@ -95,23 +95,23 @@ HANDLE PASCAL RAROpenArchiveEx(struct RAROpenArchiveDataEx *r)

     r->Flags=0;

     if (Data->Arc.Volume)

-      r->Flags|=0x01;

+      r->Flags|=ROADF_VOLUME;

     if (Data->Arc.MainComment)

-      r->Flags|=0x02;

+      r->Flags|=ROADF_COMMENT;

     if (Data->Arc.Locked)

-      r->Flags|=0x04;

+      r->Flags|=ROADF_LOCK;

     if (Data->Arc.Solid)

-      r->Flags|=0x08;

+      r->Flags|=ROADF_SOLID;

     if (Data->Arc.NewNumbering)

-      r->Flags|=0x10;

+      r->Flags|=ROADF_NEWNUMBERING;

     if (Data->Arc.Signed)

-      r->Flags|=0x20;

+      r->Flags|=ROADF_SIGNED;

     if (Data->Arc.Protected)

-      r->Flags|=0x40;

+      r->Flags|=ROADF_RECOVERY;

     if (Data->Arc.Encrypted)

-      r->Flags|=0x80;

+      r->Flags|=ROADF_ENCHEADERS;

     if (Data->Arc.FirstVolume)

-      r->Flags|=0x100;

+      r->Flags|=ROADF_FIRSTVOLUME;

     Array<wchar> CmtDataW;

     if (r->CmtBufSize!=0 && Data->Arc.GetComment(&CmtDataW))

@@ -2,8 +2,8 @@

 #include <commctrl.h>

 VS_VERSION_INFO VERSIONINFO

-FILEVERSION 5, 71, 100, 3045

-PRODUCTVERSION 5, 71, 100, 3045

+FILEVERSION 5, 90, 100, 3379

+PRODUCTVERSION 5, 90, 100, 3379

 FILEOS VOS__WINDOWS32

 FILETYPE VFT_APP

 {

@@ -14,9 +14,9 @@ FILETYPE VFT_APP

       VALUE "CompanyName", "Alexander Roshal\0"

       VALUE "ProductName", "RAR decompression library\0"

       VALUE "FileDescription", "RAR decompression library\0"

-      VALUE "FileVersion", "5.71.0\0"

-      VALUE "ProductVersion", "5.71.0\0"

+      VALUE "FileVersion", "5.90.0\0"

+      VALUE "ProductVersion", "5.90.0\0"

       VALUE "OriginalFilename", "Unrar.dll\0"

     }

   }

@@ -158,6 +158,7 @@ void ErrorHandler::OpenErrorMsg(const wchar *FileName)

 void ErrorHandler::OpenErrorMsg(const wchar *ArcName,const wchar *FileName)

 {

+  Wait(); // Keep GUI responsive if many files cannot be opened when archiving.

   uiMsg(UIERROR_FILEOPEN,ArcName,FileName);

   SysErrMsg();

   SetErrorCode(RARX_OPEN);

@@ -328,7 +329,7 @@ void ErrorHandler::Throw(RAR_EXIT Code)

 bool ErrorHandler::GetSysErrMsg(wchar *Msg,size_t Size)

 {

-#if !defined(SFX_MODULE) && !defined(SILENT)

+#ifndef SILENT

 #ifdef _WIN_ALL

   int ErrType=GetLastError();

   if (ErrType!=0)

@@ -361,7 +362,7 @@ void ErrorHandler::SysErrMsg()

     return;

 #ifdef _WIN_ALL

   wchar *CurMsg=Msg;

-  while (CurMsg!=NULL)

+  while (CurMsg!=NULL) // Print string with \r\n as several strings to multiple lines.

   {

     while (*CurMsg=='\r' || *CurMsg=='\n')

       CurMsg++;

@@ -40,6 +40,8 @@ void CmdExtract::DoExtract()

   {

     if (Cmd->ManualPassword)

       Cmd->Password.Clean(); // Clean user entered password before processing next archive.

+  

+    ReconstructDone=false; // Must be reset here, not in ExtractArchiveInit().

     while (true)

     {

       EXTRACT_ARC_CODE Code=ExtractArchive();

@@ -93,7 +95,6 @@ void CmdExtract::ExtractArchiveInit(Archive &Arc)

   PrevProcessed=false;

   AllMatchesExact=true;

-  ReconstructDone=false;

   AnySolidDataUnpackedWell=false;

   StartTime.SetCurrentTime();

@@ -479,13 +480,13 @@ bool CmdExtract::ExtractCurrentFile(Archive &Arc,size_t HeaderSize,bool &Repeat)

         {

           // This message is used by Android GUI to reset cached passwords.

           // Update appropriate code if changed.

-          uiMsg(UIERROR_BADPSW,ArcFileName);

+          uiMsg(UIERROR_BADPSW,Arc.FileName,ArcFileName);

         }

         else // For passwords entered manually.

         {

           // This message is used by Android GUI and Windows GUI and SFX to

           // reset cached passwords. Update appropriate code if changed.

-          uiMsg(UIWAIT_BADPSW,ArcFileName);

+          uiMsg(UIWAIT_BADPSW,Arc.FileName,ArcFileName);

           Cmd->Password.Clean();

           // Avoid new requests for unrar.dll to prevent the infinite loop

@@ -624,7 +625,6 @@ bool CmdExtract::ExtractCurrentFile(Archive &Arc,size_t HeaderSize,bool &Repeat)

         CurFile.Prealloc(Arc.FileHead.UnpSize);

         Preallocated=Arc.FileHead.UnpSize;

       }

-

       CurFile.SetAllowDelete(!Cmd->KeepBroken);

       bool FileCreateMode=!TestMode && !SkipSolid && Command!='P';

@@ -736,38 +736,52 @@ bool CmdExtract::ExtractCurrentFile(Archive &Arc,size_t HeaderSize,bool &Repeat)

       else

         mprintf(L"\b\b\b\b\b     ");

+      // If we successfully unpacked a hard link, we wish to set its file

+      // attributes. Hard link shares file metadata with link target,

+      // so we do not need to set link time or owner. But when we overwrite

+      // an existing link, we can call PrepareToDelete(), which affects

+      // link target attributes as well. So we set link attributes to restore

+      // both target and link attributes if PrepareToDelete() changed them.

+      bool SetAttrOnly=LinkEntry && Arc.FileHead.RedirType==FSREDIR_HARDLINK && LinkSuccess;

+

       if (!TestMode && (Command=='X' || Command=='E') &&

-          (!LinkEntry || Arc.FileHead.RedirType==FSREDIR_FILECOPY && LinkSuccess) && 

+          (!LinkEntry || SetAttrOnly || Arc.FileHead.RedirType==FSREDIR_FILECOPY && LinkSuccess) && 

           (!BrokenFile || Cmd->KeepBroken))

       {

-        // We could preallocate more space that really written to broken file

-        // or file with crafted header.

-        if (Preallocated>0 && (BrokenFile || DataIO.CurUnpWrite!=Preallocated))

-          CurFile.Truncate();

+        // Below we use DestFileName instead of CurFile.FileName,

+        // so we can set file attributes also for hard links, which do not

+        // have the open CurFile. These strings are the same for other items.

-#if defined(_WIN_ALL) || defined(_EMX)

-        if (Cmd->ClearArc)

-          Arc.FileHead.FileAttr&=~FILE_ATTRIBUTE_ARCHIVE;

-#endif

+        if (!SetAttrOnly)

+        {

+          // We could preallocate more space that really written to broken file

+          // or file with crafted header.

+          if (Preallocated>0 && (BrokenFile || DataIO.CurUnpWrite!=Preallocated))

+            CurFile.Truncate();

-        CurFile.SetOpenFileTime(

-          Cmd->xmtime==EXTTIME_NONE ? NULL:&Arc.FileHead.mtime,

-          Cmd->xctime==EXTTIME_NONE ? NULL:&Arc.FileHead.ctime,

-          Cmd->xatime==EXTTIME_NONE ? NULL:&Arc.FileHead.atime);

-        CurFile.Close();

+          CurFile.SetOpenFileTime(

+            Cmd->xmtime==EXTTIME_NONE ? NULL:&Arc.FileHead.mtime,

+            Cmd->xctime==EXTTIME_NONE ? NULL:&Arc.FileHead.ctime,

+            Cmd->xatime==EXTTIME_NONE ? NULL:&Arc.FileHead.atime);

+          CurFile.Close();

+

+          SetFileHeaderExtra(Cmd,Arc,DestFileName);

+

+          CurFile.SetCloseFileTime(

+            Cmd->xmtime==EXTTIME_NONE ? NULL:&Arc.FileHead.mtime,

+            Cmd->xatime==EXTTIME_NONE ? NULL:&Arc.FileHead.atime);

+        }

+        

 #if defined(_WIN_ALL) && !defined(SFX_MODULE)

         if (Cmd->SetCompressedAttr &&

             (Arc.FileHead.FileAttr & FILE_ATTRIBUTE_COMPRESSED)!=0)

-          SetFileCompression(CurFile.FileName,true);

+          SetFileCompression(DestFileName,true);

+        if (Cmd->ClearArc)

+          Arc.FileHead.FileAttr&=~FILE_ATTRIBUTE_ARCHIVE;

 #endif

-        SetFileHeaderExtra(Cmd,Arc,CurFile.FileName);

-

-        CurFile.SetCloseFileTime(

-          Cmd->xmtime==EXTTIME_NONE ? NULL:&Arc.FileHead.mtime,

-          Cmd->xatime==EXTTIME_NONE ? NULL:&Arc.FileHead.atime);

-        if (!Cmd->IgnoreGeneralAttr && !SetFileAttr(CurFile.FileName,Arc.FileHead.FileAttr))

-          uiMsg(UIERROR_FILEATTR,Arc.FileName,CurFile.FileName);

+        if (!Cmd->IgnoreGeneralAttr && !SetFileAttr(DestFileName,Arc.FileHead.FileAttr))

+          uiMsg(UIERROR_FILEATTR,Arc.FileName,DestFileName);

         PrevProcessed=true;

       }

@@ -13,6 +13,7 @@ File::File()

   OpenShared=false;

   AllowDelete=true;

   AllowExceptions=true;

+  PreserveAtime=false;

 #ifdef _WIN_ALL

   NoSequentialRead=false;

   CreateMode=FMF_UNDEFINED;

@@ -56,6 +57,9 @@ bool File::Open(const wchar *Name,uint Mode)

   if (OpenShared)

     ShareMode|=FILE_SHARE_WRITE;

   uint Flags=NoSequentialRead ? 0:FILE_FLAG_SEQUENTIAL_SCAN;

+  FindData FD;

+  if (PreserveAtime)

+    Access|=FILE_WRITE_ATTRIBUTES; // Needed to preserve atime.

   hNewFile=CreateFile(Name,Access,ShareMode,NULL,OPEN_EXISTING,Flags,NULL);

   DWORD LastError;

@@ -86,6 +90,11 @@ bool File::Open(const wchar *Name,uint Mode)

   }

   if (hNewFile==FILE_BAD_HANDLE && LastError==ERROR_FILE_NOT_FOUND)

     ErrorType=FILE_NOTFOUND;

+  if (PreserveAtime && hNewFile!=FILE_BAD_HANDLE)

+  {

+    FILETIME ft={0xffffffff,0xffffffff}; // This value prevents atime modification.

+    SetFileTime(hNewFile,NULL,&ft,NULL);

+  }

 #else

   int flags=UpdateMode ? O_RDWR:(WriteMode ? O_WRONLY:O_RDONLY);

@@ -95,6 +104,11 @@ bool File::Open(const wchar *Name,uint Mode)

   flags|=O_LARGEFILE;

 #endif

 #endif

+  // NDK r20 has O_NOATIME, but fails to create files with it in Android 7+.

+#if defined(O_NOATIME)

+  if (PreserveAtime)

+    flags|=O_NOATIME;

+#endif

   char NameA[NM];

   WideToChar(Name,NameA,ASIZE(NameA));

@@ -230,7 +244,7 @@ bool File::Close()

     {

 #ifdef _WIN_ALL

       // We use the standard system handle for stdout in Windows

-      // and it must not  be closed here.

+      // and it must not be closed here.

       if (HandleType==FILE_HANDLENORMAL)

         Success=CloseHandle(hFile)==TRUE;

 #else

@@ -387,7 +401,7 @@ int File::Read(void *Data,size_t Size)

     }

     break;

   }

-  return ReadSize;

+  return ReadSize; // It can return -1 only if AllowExceptions is disabled.

 }

@@ -670,9 +684,11 @@ void File::GetOpenFileTime(RarTime *ft)

 int64 File::FileLength()

 {

-  SaveFilePos SavePos(*this);

+  int64 SavePos=Tell();

   Seek(0,SEEK_END);

-  return Tell();

+  int64 Length=Tell();

+  Seek(SavePos,SEEK_SET);

+  return Length;

 }

@@ -62,6 +62,7 @@ class File

     bool NoSequentialRead;

     uint CreateMode;

 #endif

+    bool PreserveAtime;

   protected:

     bool OpenShared; // Set by 'Archive' class.

   public:

@@ -114,6 +115,7 @@ class File

 #ifdef _WIN_ALL

     void RemoveSequentialFlag() {NoSequentialRead=true;}

 #endif

+    void SetPreserveAtime(bool Preserve) {PreserveAtime=Preserve;}

 #ifdef _UNIX

     int GetFD()

     {

@@ -360,7 +360,7 @@ wchar *MkTemp(wchar *Name,size_t MaxSize)

 #if !defined(SFX_MODULE)

 void CalcFileSum(File *SrcFile,uint *CRC32,byte *Blake2,uint Threads,int64 Size,uint Flags)

 {

-  SaveFilePos SavePos(*SrcFile);

+  int64 SavePos=SrcFile->Tell();

 #ifndef SILENT

   int64 FileLength=Size==INT64NDF ? SrcFile->FileLength() : Size;

 #endif

@@ -415,6 +415,8 @@ void CalcFileSum(File *SrcFile,uint *CRC32,byte *Blake2,uint Threads,int64 Size,

     if (Size!=INT64NDF)

       Size-=ReadSize;

   }

+  SrcFile->Seek(SavePos,SEEK_SET);

+

   if ((Flags & CALCFSUM_SHOWPERCENT)!=0)

     uiMsg(UIEVENT_FILESUMEND);

@@ -63,12 +63,12 @@ bool FindFile::Next(FindData *fd,bool GetSymLink)

   }

   while (1)

   {

+    wchar Name[NM];

     struct dirent *ent=readdir(dirp);

     if (ent==NULL)

       return false;

     if (strcmp(ent->d_name,".")==0 || strcmp(ent->d_name,"..")==0)

       continue;

-    wchar Name[NM];

     if (!CharToWide(ent->d_name,Name,ASIZE(Name)))

       uiMsg(UIERROR_INVALIDNAME,UINULL,Name);

@@ -53,7 +53,7 @@ DataHash::DataHash()

 DataHash::~DataHash()

 {

 #ifdef RAR_SMP

-  DestroyThreadPool(ThPool);

+  delete ThPool;

 #endif

   cleandata(&CurCRC32, sizeof(CurCRC32));

   if (blake2ctx!=NULL)

@@ -94,7 +94,7 @@ void DataHash::Update(const void *Data,size_t DataSize)

   {

 #ifdef RAR_SMP

     if (MaxThreads>1 && ThPool==NULL)

-      ThPool=CreateThreadPool();

+      ThPool=new ThreadPool(BLAKE2_THREADS_NUMBER);

     blake2ctx->ThPool=ThPool;

     blake2ctx->MaxThreads=MaxThreads;

 #endif

@@ -345,7 +345,7 @@ void ListFileHeader(Archive &Arc,FileHeader &hd,bool &TitleShown,bool Verbose,bo

       mprintf(L"\n%12ls: %ls",St(MListHostOS),HostOS);