Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
rikyoz committed Oct 2, 2023
2 parents fb2da68 + f9dc711 commit 3759449
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div align="center">
<a href="https://github.com/rikyoz/bit7z/releases" title="Latest Stable GitHub Release"><img src="https://img.shields.io/github/release/rikyoz/bit7z/all.svg?style=flat&logo=github&logoColor=white&colorB=blue&label=" alt="GitHub release"></a>&thinsp;<img src="https://img.shields.io/badge/-C++14-3F63B3.svg?style=flat&logo=C%2B%2B&logoColor=white" alt="C++14" title="C++ Standards Used: C++14">&thinsp;<img src="https://img.shields.io/badge/-Windows-6E46A2.svg?style=flat&logo=windows-11&logoColor=white" alt="Windows" title="Supported Platform: Windows">&thinsp;<img src="https://img.shields.io/badge/-Linux-9C2A91.svg?style=flat&logo=linux&logoColor=white" alt="Linux" title="Supported Platform: Linux">&thinsp;<img src="https://img.shields.io/badge/-macOS-red.svg?style=flat&logo=apple&logoColor=white" alt="macOS" title="Supported Platform: macOS">&thinsp;<img src="https://img.shields.io/badge/-x86%20&middot;%20x64%20&middot;%20arm%20&middot;%20arm64-orange.svg?style=flat&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIHZpZXdCb3g9IjAgMCA5NDIgOTQyIj48cGF0aCBmaWxsPSIjZmZmIiBkPSJNNTc5LjEgODk0YTQ4IDQ4IDAgMCAwIDk2IDB2LTc3LjVoLTk1LjlWODk0aC0uMXpNNTc5LjEgNDh2NzcuNUg2NzVWNDhhNDggNDggMCAwIDAtOTUuOSAwek00MjMgNDh2NzcuNWg5NlY0OGE0OCA0OCAwIDAgMC05NiAwek00MjMgODk0YTQ4IDQ4IDAgMCAwIDk2IDB2LTc3LjVoLTk2Vjg5NHpNMjY3IDQ4djc3LjVoOTUuOVY0OGE0OCA0OCAwIDAgMC05NS45IDB6TTI2NyA4OTRhNDggNDggMCAwIDAgOTYgMHYtNzcuNWgtOTZWODk0ek0wIDYyN2E0OCA0OCAwIDAgMCA0OCA0OGg3Ny41di05NS45SDQ4QTQ4IDQ4IDAgMCAwIDAgNjI3ek04OTQgNTc5LjFoLTc3LjVWNjc1SDg5NGE0OCA0OCAwIDAgMCAwLTk1Ljl6TTAgNDcxYTQ4IDQ4IDAgMCAwIDQ4IDQ4aDc3LjV2LTk2SDQ4YTQ4IDQ4IDAgMCAwLTQ4IDQ4ek04OTQgNDIzaC03Ny41djk2SDg5NGE0OCA0OCAwIDAgMCAwLTk2ek0wIDMxNWE0OCA0OCAwIDAgMCA0OCA0OGg3Ny41di05Nkg0OGE0OCA0OCAwIDAgMC00OCA0OHpNODk0IDI2N2gtNzcuNXY5NS45SDg5NGE0OCA0OCAwIDAgMCAwLTk1Ljl6TTE3MS42IDcyMC40YTUwIDUwIDAgMCAwIDUwIDUwaDQ5OC44YTUwIDUwIDAgMCAwIDUwLTUwVjIyMS42YTUwIDUwIDAgMCAwLTUwLTUwSDIyMS42YTUwIDUwIDAgMCAwLTUwIDUwdjQ5OC44eiIvPjwvc3ZnPg==" alt="x86, x64, arm, arm64" title="Supported CPU Architectures: x86, x64, arm, arm64">&thinsp;<a href="#%EF%B8%8F-donate" title="Donate"><img src="https://img.shields.io/badge/-donate-yellow.svg?style=flat&logo=paypal&logoColor=white" alt="donate"></a>&thinsp;<a href="https://github.com/rikyoz/bit7z/wiki" title="Project Documentation"><img src="https://img.shields.io/badge/-docs-green.svg?style=flat&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGRhdGEtbmFtZT0iTGF5ZXIgMSIgdmlld0JveD0iMCAwIDEwNS4zIDEyMi45Ij48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGZpbGw9IiNmZmYiIGQ9Ik0xNy41IDBIMTAydjk0LjJjLS4xIDIuNy0zLjUgMi43LTcuMiAyLjZIMTYuM2E5LjIgOS4yIDAgMCAwIDAgMTguNEg5OHYtOS44aDcuMlYxMThhNC4yIDQuMiAwIDAgMS00LjEgNC4xSDE2LjZDNy41IDEyNS41IDAgMTE4IDAgMTA4LjhWMTcuNUExNy42IDE3LjYgMCAwIDEgMTcuNSAwWm0tMS4zIDEwOGg3NS4yYTEuNCAxLjQgMCAwIDEgMS40IDEuM3YuOGExLjQgMS40IDAgMCAxLTEuNCAxLjRIMTYuMmExLjQgMS40IDAgMCAxLTEuMy0xLjR2LS44YTEuNCAxLjQgMCAwIDEgMS4zLTEuNFptMC03LjJoNzUuMmExLjQgMS40IDAgMCAxIDEuNCAxLjR2LjhhMS40IDEuNCAwIDAgMS0xLjQgMS40SDE2LjJBMS40IDEuNCAwIDAgMSAxNSAxMDN2LS44YTEuNCAxLjQgMCAwIDEgMS4zLTEuNFoiLz48L3N2Zz4=" alt="docs"></a>&thinsp;<a href="https://ci.appveyor.com/project/rikyoz/bit7z" title="AppVeyor CI Build Status"><img src="https://img.shields.io/appveyor/ci/rikyoz/bit7z.svg?style=flat&logo=appveyor&logoColor=white&label=" alt="Build status"></a>
<br>
<img src="https://img.shields.io/badge/MSVC%202015+-flag.svg?color=555555&style=flat&logo=visual%20studio&logoColor=white" alt="MSVC 2015+" title="Supported Windows Compiler: MSVC 2015 or later">&thinsp;<img src="https://img.shields.io/badge/MinGW%206.4+%20-flag.svg?color=555555&style=flat&logo=windows&logoColor=white" alt="MinGW 6.4+" title="Supported Windows Compiler: MinGW 6.4 or later">&thinsp;<img src="https://img.shields.io/badge/GCC%204.9+-flag.svg?color=555555&style=flat&logo=gnu&logoColor=white" alt="GCC 4.9+" title="Supported Unix Compiler: GCC 4.9 or later">&thinsp;<img src="https://img.shields.io/badge/Clang%203.6+-flag.svg?color=555555&style=flat&logo=llvm&logoColor=white" alt="Clang 3.6+" title="Supported Unix Compiler: Clang 3.5 or later">&thinsp;<a href="https://www.codefactor.io/repository/github/rikyoz/bit7z" alt="Codefactor Grade"><img alt="CodeFactor Grade" src="https://img.shields.io/codefactor/grade/github/rikyoz/bit7z?label=Code%20Quality&logo=codefactor&logoColor=white"></a>&thinsp;<a href="https://github.com/rikyoz/bit7z/blob/master/LICENSE" title="Project License: MPLv2"><img src="https://img.shields.io/badge/-MPL--2.0-lightgrey.svg?style=flat&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGwtcnVsZT0iZXZlbm9kZCIgaW1hZ2UtcmVuZGVyaW5nPSJvcHRpbWl6ZVF1YWxpdHkiIHNoYXBlLXJlbmRlcmluZz0iZ2VvbWV0cmljUHJlY2lzaW9uIiB2aWV3Qm94PSIwIDAgNTEyIDQzMCIgeG1sbnM6dj0iaHR0cHM6Ly92ZWN0YS5pby9uYW5vIj48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMzUgMGg0NDJjMTkgMCAzNSAxNiAzNSAzNXYzMDBjMCAxOS0xNiAzNS0zNSAzNWgtNjlsLTExLTIyaDgyYzUgMCAxMC00IDEwLTEwVjk3SDI1djI0MWMwIDYgNCAxMCA5IDEwaDgxbC05IDE4LTIgNEgzNWMtMTkgMC0zNS0xNi0zNS0zNVYzNUMwIDE2IDE2IDAgMzUgMHptMjI5IDE1MWM1IDIgOSA1IDEzIDkgOSA3IDEwIDkgMjMgOWwxNCAyYzggMyAxMyAxMCAxNSAxOCAyIDcgMSAxNCA0IDIxIDIgNyA3IDEyIDExIDE4IDMgNSA0IDkgNSAxM2EyNSAyNSAwIDAgMS03IDI0bC05IDlhMjYgMjYgMCAwIDAtMiAxMWMwIDUgMCAxMC0zIDE3YTMyIDMyIDAgMCAxLTIwIDE2Yy02IDItMTQgMC0xOCAyaC0xYy04IDMtMTUgMTItMjMgMTVhMzEgMzEgMCAwIDEtMTAgMmwtOS0yaC0xYy00LTEtOC00LTEyLTgtMy0zLTctNi0xMi04aC03bC0xMS0xYy01LTEtOC0zLTEyLTZhMzMgMzMgMCAwIDEtOC0xMGMtMy03LTMtMTItMy0xNyAwLTkgMC0xMS03LTE2LTgtOC0xNC0xNi0xMi0yOCAyLTYgNS0xMiAxMS0yMGEzNyAzNyAwIDAgMCA2LTExYzMtNiAyLTEzIDMtMjAgMi04IDctMTUgMTUtMThsMTUtM2MxMiAwIDE0LTIgMjMtOWE0MSA0MSAwIDAgMSAxMy05IDI3IDI3IDAgMCAxIDE2IDB6bTg3IDI1N2wtMjQtNC0xMSAyMWgtMWMtNSA2LTkgNi0xMyAzcy03LTExLTktMTV2LTJsLTI1LTQ3YTMgMyAwIDAgMSAxLTRsOS01IDEwLTlhMyAzIDAgMCAxIDIgMGM3IDAgMTQtMSAxOS0zIDYtMiAxMS01IDE2LTExaDRsMSAxIDI5IDU1YzIgNSA1IDExIDIgMTYtMSAzLTQgNS05IDRoLTF6bS0xNjYtNGwtMjQgNGgtMWMtNSAxLTgtMS05LTRsLTEtOCAzLTggMjktNTYgMS0xYzEtMSAzIDAgNCAxIDQgNiAxMCA5IDE1IDExIDYgMiAxMyAzIDIwIDJsMiAxIDEwIDkgOSA1YTMgMyAwIDAgMSAxIDRsLTI1IDQ3djFhMzkgMzkgMCAwIDEtOSAxNmMtNCAzLTggMy0xMy0zaC0xbC0xMS0yMXptMTAwLTIwM2E1MSA1MSAwIDAgMC04MCA0MiA1MSA1MSAwIDEgMCAxMDIgMCA1MiA1MiAwIDAgMC03LTI2IDUxIDUxIDAgMCAwLTE1LTE2ek00NDQgMzlhMTcgMTcgMCAxIDEgMCAzNCAxNyAxNyAwIDAgMSAwLTM0em0tMTE2IDBhMTcgMTcgMCAxIDEgMCAzNCAxNyAxNyAwIDAgMSAwLTM0em01OCAwYTE3IDE3IDAgMSAxIDAgMzQgMTcgMTcgMCAwIDEgMC0zNHoiLz48L3N2Zz4=" alt="License"></a>
<img src="https://img.shields.io/badge/MSVC%202015+-flag.svg?color=555555&style=flat&logo=visual%20studio&logoColor=white" alt="MSVC 2015+" title="Supported Windows Compiler: MSVC 2015 or later">&thinsp;<img src="https://img.shields.io/badge/MinGW%206.4+%20-flag.svg?color=555555&style=flat&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMzIgMTMyIj48cGF0aCBmaWxsPSIjY2NjIiBkPSJtMCA1MiAyMy0yNCAyNCAyNC0yNCAyM3ptMCA1OCAyMy0yNCAyNCAyNC0yNCAyM3oiLz48cGF0aCBmaWxsPSIjN2Q3ZDdkIiBkPSJtMjkgODEgMjMtMjQgMjQgMjQtMjQgMjN6bS0xLTU4TDUyIDBsMjMgMjMtMjMgMjR6Ii8+PHBhdGggZmlsbD0iI2NjYyIgZD0ibTU3IDUyIDI0LTIzIDIzIDIzLTIzIDI0eiIvPjxwYXRoIGZpbGw9IiM3ZDdkN2QiIGQ9Im04NiAyMyAyNC0yMyAyMyAyMy0yMyAyNHoiLz48cGF0aCBmaWxsPSIjY2NjIiBkPSJtNTcgMTA5IDI0LTIzIDIzIDIzLTIzIDIzeiIvPjxwYXRoIGZpbGw9IiM3ZDdkN2QiIGQ9Im04NiA4MSAyMy0yNCAyMyAyNC0yMyAyM3oiLz48L3N2Zz4=&logoColor=white">&thinsp;<img src="https://img.shields.io/badge/GCC%204.9+-flag.svg?color=555555&style=flat&logo=gnu&logoColor=white" alt="GCC 4.9+" title="Supported Unix Compiler: GCC 4.9 or later">&thinsp;<img src="https://img.shields.io/badge/Clang%203.6+-flag.svg?color=555555&style=flat&logo=llvm&logoColor=white" alt="Clang 3.6+" title="Supported Unix Compiler: Clang 3.5 or later">&thinsp;<a href="https://www.codefactor.io/repository/github/rikyoz/bit7z" alt="Codefactor Grade"><img alt="CodeFactor Grade" src="https://img.shields.io/codefactor/grade/github/rikyoz/bit7z?label=Code%20Quality&logo=codefactor&logoColor=white"></a>&thinsp;<a href="https://github.com/rikyoz/bit7z/blob/master/LICENSE" title="Project License: MPLv2"><img src="https://img.shields.io/badge/-MPL--2.0-lightgrey.svg?style=flat&logo=mozilla" alt="License"></a>
</div>

## ⚡️ Introduction
Expand Down
4 changes: 2 additions & 2 deletions src/internal/fsitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ auto FilesystemItem::getStream( ISequentialInStream** inStream ) const -> HRESUL

if ( mSymlinkPolicy == SymlinkPolicy::DoNotFollow && isSymLink() ) {
try {
auto inStreamLoc = bit7z::make_com< CSymlinkInStream >( path() );
auto inStreamLoc = bit7z::make_com< CSymlinkInStream >( filesystemPath() );
*inStream = inStreamLoc.Detach();
return S_OK;
} catch ( const BitException& ex ) {
Expand All @@ -148,7 +148,7 @@ auto FilesystemItem::getStream( ISequentialInStream** inStream ) const -> HRESUL
}

try {
auto inStreamLoc = bit7z::make_com< CFileInStream >( path() );
auto inStreamLoc = bit7z::make_com< CFileInStream >( filesystemPath() );
*inStream = inStreamLoc.Detach();
} catch ( const BitException& ex ) {
return ex.nativeCode();
Expand Down

0 comments on commit 3759449

Please sign in to comment.