dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 23:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Teach '-E tar' to report errors copying data

Browse Source 
The `copy_data` function checks for errors but the caller ignored
them.  Simplify its return type and add a check to the caller.
This commit is contained in:
Ruslan Baratov
2018-05-16 23:44:56 +03:00
committed by Brad King
parent 743f24bac6
commit a203fcc63d
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmSystemTools.cxx
View File

@@ -1696,7 +1696,8 @@ void list_item_verbose(FILE* out, struct archive_entry* entry)
fflush(out); fflush(out);
} }
long copy_data(struct archive* ar, struct archive* aw) // Return 'true' on success
bool copy_data(struct archive* ar, struct archive* aw)
{ {
long r; long r;
const void* buff; const void* buff;
@@ -1708,22 +1709,28 @@ long copy_data(struct archive* ar, struct archive* aw)
#endif #endif
for (;;) { for (;;) {
// Return value:
// * ARCHIVE_OK - read succeed
// * ARCHIVE_EOF - no more data to read left
r = archive_read_data_block(ar, &buff, &size, &offset); r = archive_read_data_block(ar, &buff, &size, &offset);
if (r == ARCHIVE_EOF) { if (r == ARCHIVE_EOF) {
return (ARCHIVE_OK); return true;
} }
if (r != ARCHIVE_OK) { if (r != ARCHIVE_OK) {
return (r); return false;
} }
r = archive_write_data_block(aw, buff, size, offset); // Return value:
if (r != ARCHIVE_OK) { // * >= ARCHIVE_OK - write succeed
// * < ARCHIVE_OK - write failed
const la_ssize_t w_size = archive_write_data_block(aw, buff, size, offset);
if (w_size < ARCHIVE_OK) {
cmSystemTools::Message("archive_write_data_block()", cmSystemTools::Message("archive_write_data_block()",
archive_error_string(aw)); archive_error_string(aw));
return (r); return false;
} }
} }
#if !defined(__clang__) && !defined(__HP_aCC) #if !defined(__clang__) && !defined(__HP_aCC)
return r; /* this should not happen but it quiets some compilers */ return false; /* this should not happen but it quiets some compilers */
#endif #endif
} }
@@ -1776,7 +1783,10 @@ bool extract_tar(const char* outFileName, bool verbose, bool extract)
r = archive_write_header(ext, entry); r = archive_write_header(ext, entry);
if (r == ARCHIVE_OK) { if (r == ARCHIVE_OK) {
copy_data(a, ext); if (!copy_data(a, ext)) {
cmSystemTools::Error("Problem with copy_data");
break;
}
r = archive_write_finish_entry(ext); r = archive_write_finish_entry(ext);
if (r != ARCHIVE_OK) { if (r != ARCHIVE_OK) {
cmSystemTools::Error("Problem with archive_write_finish_entry(): ", cmSystemTools::Error("Problem with archive_write_finish_entry(): ",