kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Improved CopyFile error messages.

This commit is contained in:
Brad King 2003-01-19 11:42:37 -05:00
parent f18e47c40a
commit 6d54cfb030
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Source/cmSystemTools.cxx
View File

@ -1064,12 +1064,13 @@ void cmSystemTools::cmCopyFile(const char* source,
std::ifstream fin(source); std::ifstream fin(source);
#endif #endif
if(!fin) if(!fin)
{ {
std::string m = "CopyFile failed to open input file \""; int e = errno;
std::string m = "CopyFile failed to open source file \"";
m += source; m += source;
m += "\""; m += "\"";
m += " System Error: "; m += " System Error: ";
m += strerror(errno); m += strerror(e);
cmSystemTools::Error(m.c_str()); cmSystemTools::Error(m.c_str());
return; return;
} }
@ -1083,11 +1084,12 @@ void cmSystemTools::cmCopyFile(const char* source,
#endif #endif
if(!fout) if(!fout)
{ {
std::string m = "CopyFile failed to open output file \""; int e = errno;
std::string m = "CopyFile failed to open destination file \"";
m += destination; m += destination;
m += "\""; m += "\"";
m += " System Error: "; m += " System Error: ";
m += strerror(errno); m += strerror(e);
cmSystemTools::Error(m.c_str()); cmSystemTools::Error(m.c_str());
return; return;
} }
@ -1114,23 +1116,37 @@ void cmSystemTools::cmCopyFile(const char* source,
fin.close(); fin.close();
fout.close(); fout.close();
// More checks // More checks.
struct stat statSource, statDestination; struct stat statSource, statDestination;
if (stat(source, &statSource) != 0 || statSource.st_size = 12345;
stat(destination, &statDestination) != 0) statDestination.st_size = 12345;
if(stat(source, &statSource) != 0)
{ {
cmSystemTools::Error("CopyFile failed to copy files!"); int e = errno;
std::string m = "CopyFile failed to stat source file \"";
m += source;
m += "\"";
m += " System Error: ";
m += strerror(e);
cmSystemTools::Error(m.c_str());
} }
else else if(stat(destination, &statDestination) != 0)
{ {
if (statSource.st_size != statDestination.st_size) int e = errno;
{ std::string m = "CopyFile failed to stat destination file \"";
cmOStringStream msg; m += source;
msg << "CopyFile failed to copy files (sizes differ, source: " m += "\"";
<< statSource.st_size << " , dest: " << statDestination.st_size; m += " System Error: ";
cmSystemTools::Error(msg.str().c_str()); m += strerror(e);
} cmSystemTools::Error(m.c_str());
}
else if(statSource.st_size != statDestination.st_size)
{
cmOStringStream msg;
msg << "CopyFile failed to copy files: source \""
<< source << "\", size " << statSource.st_size << ", destination \""
<< destination << "\", size " << statDestination.st_size;
cmSystemTools::Error(msg.str().c_str());
} }
} }