mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-11 17:49:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'file-download-handle-write-error'

Browse Source 
9476245dcd file(DOWNLOAD): Handle write errors
1994393f7a cmCurl: Provide CURL_WRITEFUNC_ERROR for curl < 7.87

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10507
This commit is contained in:
Brad King
2025-03-27 13:16:58 +00:00
committed by Kitware Robot
parent bc88b04944 9476245dcd
commit ed91e8c360
6 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmCurl.h
View File

@@ -11,6 +11,11 @@
#include <cm3p/curl/curl.h>
// curl versions before 7.87.0 did not provide CURL_WRITEFUNC_ERROR
#if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x075700
# define CURL_WRITEFUNC_ERROR 0xFFFFFFFF
#endif
void cmCurlInitOnce();
cm::optional<int> cmCurlParseTLSVersion(cm::string_view tls_version);
cm::optional<std::string> cmCurlPrintTLSVersion(int curl_tls_version);

19
Source/cmFileCommand.cxx
View File

@@ -1703,7 +1703,9 @@ size_t cmWriteToFileCallback(void* ptr, size_t size, size_t nmemb, void* data)
cmsys::ofstream* fout = static_cast<cmsys::ofstream*>(data);
if (fout) {
char const* chPtr = static_cast<char*>(ptr);
fout->write(chPtr, realsize);
if (!fout->write(chPtr, realsize)) {
return CURL_WRITEFUNC_ERROR;
}
}
return realsize;
}
@@ -2283,6 +2285,14 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
g_curl.release();
::curl_easy_cleanup(curl);
// Explicitly close the file so we can check for write errors.
if (!file.empty()) {
fout.close();
if (!fout) {
res = CURLE_WRITE_ERROR;
}
}
if (!statusVar.empty()) {
std::string m = curl_easy_strerror(res);
if ((res == CURLE_SSL_CONNECT_ERROR ||
@@ -2306,13 +2316,6 @@ bool HandleDownloadCommand(std::vector<std::string> const& args,
status.GetMakefile().AddDefinition(logVar, chunkDebug.data());
}
// Explicitly flush/close so we can measure the md5 accurately.
//
if (!file.empty()) {
fout.flush();
fout.close();
}
// Verify MD5 sum if requested:
//
if (hash) {

7
Tests/RunCMake/file-DOWNLOAD/RunCMakeTest.cmake
View File

@@ -23,6 +23,13 @@ run_cmake(no-file)
run_cmake(range)
run_cmake(SHOW_PROGRESS)
foreach(file IN ITEMS /dev/full /dev/urandom)
if(IS_WRITABLE "${file}")
run_cmake_with_options(file-write-error -Dfile=${file})
break()
endif()
endforeach()
if(NOT CMake_TEST_NO_NETWORK)
run_cmake(bad-hostname)
endif()

4
Tests/RunCMake/file-DOWNLOAD/common.cmake
View File

@@ -2,7 +2,9 @@ if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^/")
set(slash /)
endif()
set(url "file://${slash}${CMAKE_CURRENT_SOURCE_DIR}/input.png")
set(file ${CMAKE_CURRENT_BINARY_DIR}/output.png)
if (NOT file)
set(file ${CMAKE_CURRENT_BINARY_DIR}/output.png)
endif ()
function(file_download)
file(DOWNLOAD "${url}"

1
Tests/RunCMake/file-DOWNLOAD/file-write-error-stdout.txt Normal file
View File

@@ -0,0 +1 @@
-- status='23;"Failed writing received data to disk/application"'

3
Tests/RunCMake/file-DOWNLOAD/file-write-error.cmake Normal file
View File

@@ -0,0 +1,3 @@
include(common.cmake)
file_download()