mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 21:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmArchiveWrite: Remove ./ suffix from zip archives

Browse Source 
Fixes: #20238
This commit is contained in:
Cristian Adam
2020-01-26 22:26:51 +01:00
parent 55ea8f6b1b
commit 830a7d8803
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmArchiveWrite.cxx
+7 -2
View File
@@ -200,8 +200,10 @@ bool cmArchiveWrite::Add(std::string path, size_t skip, const char* prefix,
bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix, bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix,
bool recursive) bool recursive)
{ {
if (!this->AddFile(path, skip, prefix)) { if (strcmp(path, ".") != 0 || this->Format != "zip") {
return false; if (!this->AddFile(path, skip, prefix)) {
return false;
}
} }
if ((!cmSystemTools::FileIsDirectory(path) || !recursive) || if ((!cmSystemTools::FileIsDirectory(path) || !recursive) ||
cmSystemTools::FileIsSymlink(path)) { cmSystemTools::FileIsSymlink(path)) {
@@ -210,6 +212,9 @@ bool cmArchiveWrite::AddPath(const char* path, size_t skip, const char* prefix,
cmsys::Directory d; cmsys::Directory d;
if (d.Load(path)) { if (d.Load(path)) {
std::string next = cmStrCat(path, '/'); std::string next = cmStrCat(path, '/');
if (next == "./" && this->Format == "zip") {
next.clear();
}
std::string::size_type end = next.size(); std::string::size_type end = next.size();
unsigned long n = d.GetNumberOfFiles(); unsigned long n = d.GetNumberOfFiles();
for (unsigned long i = 0; i < n; ++i) { for (unsigned long i = 0; i < n; ++i) {