[cmake-commits] hoffman committed cmCPackGenericGenerator.cxx 1.38 1.39 cmCPackPackageMakerGenerator.cxx 1.18 1.19 cmCPackTGZGenerator.cxx 1.16 1.17 cmCPackTarBZip2Generator.cxx 1.1 1.2 cmCPackTarCompressGenerator.cxx 1.6 1.7

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Oct 30 11:22:56 EST 2006


Update of /cvsroot/CMake/CMake/Source/CPack
In directory public:/mounts/ram/cvs-serv11916

Modified Files:
	cmCPackGenericGenerator.cxx cmCPackPackageMakerGenerator.cxx 
	cmCPackTGZGenerator.cxx cmCPackTarBZip2Generator.cxx 
	cmCPackTarCompressGenerator.cxx 
Log Message:
ENH: make sure null const char* is not put into ossttringstream to avoid seg faults


Index: cmCPackGenericGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackGenericGenerator.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- cmCPackGenericGenerator.cxx	15 Oct 2006 11:54:51 -0000	1.38
+++ cmCPackGenericGenerator.cxx	30 Oct 2006 16:22:47 -0000	1.39
@@ -99,10 +99,10 @@
     "Look for: CPACK_PACKAGE_DESCRIPTION_FILE" << std::endl);
   const char* descFileName
     = this->GetOption("CPACK_PACKAGE_DESCRIPTION_FILE");
-  cmCPackLogger(cmCPackLog::LOG_DEBUG,
-    "Look for: " << descFileName << std::endl);
   if ( descFileName )
     {
+    cmCPackLogger(cmCPackLog::LOG_DEBUG,
+                  "Look for: " << descFileName << std::endl);
     if ( !cmSystemTools::FileExists(descFileName) )
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -158,8 +158,9 @@
   if ( !cmsys::SystemTools::MakeDirectory(tempInstallDirectory))
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
-      "Problem creating temporary directory: " << tempInstallDirectory
-      << std::endl);
+      "Problem creating temporary directory: " 
+                  << (tempInstallDirectory ? tempInstallDirectory : "(NULL}")
+                  << std::endl);
     return 0;
     }
 
@@ -409,10 +410,10 @@
     = this->GetOption("CPACK_INSTALL_SCRIPT");
   std::string currentWorkingDirectory =
     cmSystemTools::GetCurrentWorkingDirectory();
-  cmCPackLogger(cmCPackLog::LOG_OUTPUT,
-    "- Install scripts: " << cmakeScripts << std::endl);
   if ( cmakeScripts && *cmakeScripts )
     {
+    cmCPackLogger(cmCPackLog::LOG_OUTPUT,
+                  "- Install scripts: " << cmakeScripts << std::endl);
     std::vector<std::string> cmakeScriptsVector;
     cmSystemTools::ExpandListArgument(cmakeScripts,
       cmakeScriptsVector);
@@ -667,7 +668,7 @@
 
   cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Compress package" << std::endl);
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Compress files to: "
-    << tempPackageFileName << std::endl);
+    << (tempPackageFileName ? tempPackageFileName : "(NULL)") << std::endl);
   if ( cmSystemTools::FileExists(tempPackageFileName) )
     {
     cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Remove old package file"
@@ -689,17 +690,24 @@
 
   cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Finalize package" << std::endl);
   cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Copy final package: "
-    << tempPackageFileName << " to " << packageFileName << std::endl);
+                << (tempPackageFileName ? tempPackageFileName : "(NULL)" )
+                << " to " 
+                << (packageFileName ? packageFileName : "(NULL)")
+                << std::endl);
   if ( !cmSystemTools::CopyFileIfDifferent(tempPackageFileName,
       packageFileName) )
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying the package: "
-      << tempPackageFileName << " to " << packageFileName << std::endl);
+                  << (tempPackageFileName ? tempPackageFileName : "(NULL)" )
+                  << " to " 
+                  << (packageFileName ? packageFileName : "(NULL)")
+                  << std::endl);
     return 0;
     }
 
-  cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Package " << packageFileName
-    << " generated." << std::endl);
+  cmCPackLogger(cmCPackLog::LOG_OUTPUT, "Package " 
+                << (packageFileName ? packageFileName : "(NULL)")
+                << " generated." << std::endl);
   return 1;
 }
 
@@ -939,7 +947,7 @@
 std::string cmCPackGenericGenerator::FindTemplate(const char* name)
 {
   cmCPackLogger(cmCPackLog::LOG_DEBUG, "Look for template: "
-    << name << std::endl);
+    << (name ? name : "(NULL)") << std::endl);
   std::string ffile = this->MakefileMap->GetModulesFile(name);
   cmCPackLogger(cmCPackLog::LOG_DEBUG, "Found template: "
     << ffile.c_str() << std::endl);

Index: cmCPackTarBZip2Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarBZip2Generator.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmCPackTarBZip2Generator.cxx	4 May 2006 01:42:51 -0000	1.1
+++ cmCPackTarBZip2Generator.cxx	30 Oct 2006 16:22:48 -0000	1.2
@@ -108,7 +108,7 @@
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem renaming: \""
         << compressOutFile.c_str() << "\" to \""
-        << outFileName << std::endl);
+        << (outFileName ? outFileName : "(NULL)") << std::endl);
       return 0;
       }
     }

Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cmCPackTGZGenerator.cxx	19 Oct 2006 19:00:08 -0000	1.16
+++ cmCPackTGZGenerator.cxx	30 Oct 2006 16:22:48 -0000	1.17
@@ -208,7 +208,8 @@
 int cmCPackTGZGenerator::CompressFiles(const char* outFileName,
   const char* toplevel, const std::vector<std::string>& files)
 {
-  cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: " << toplevel << std::endl);
+  cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: "
+                << (toplevel ? toplevel : "(NULL)") << std::endl);
   cmCPackTGZ_Data mydata(this, this->Compress);
   TAR *t;
   char buf[TAR_MAXPATHLEN];

Index: cmCPackPackageMakerGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackPackageMakerGenerator.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cmCPackPackageMakerGenerator.cxx	12 May 2006 18:44:24 -0000	1.18
+++ cmCPackPackageMakerGenerator.cxx	30 Oct 2006 16:22:47 -0000	1.19
@@ -236,14 +236,17 @@
   if ( !inFileName )
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack option: " << cpackVar.c_str()
-      << " not specified. It should point to " << name << ".rtf, " << name
-      << ".html, or " << name << ".txt file" << std::endl);
+                  << " not specified. It should point to " 
+                  << (name ? name : "(NULL)")
+                  << ".rtf, " << name
+                  << ".html, or " << name << ".txt file" << std::endl);
     return false;
     }
   if ( !cmSystemTools::FileExists(inFileName) )
     {
-    cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find " << name
-      << " resource file: " << inFileName << std::endl);
+    cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find " 
+                  << (name ? name : "(NULL)")
+                  << " resource file: " << inFileName << std::endl);
     return false;
     }
   std::string ext = cmSystemTools::GetFilenameLastExtension(inFileName);
@@ -260,8 +263,9 @@
   destFileName += name + ext;
 
 
-  cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " << inFileName
-    << " to " << destFileName.c_str() << std::endl);
+  cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Configure file: " 
+                << (inFileName ? inFileName : "(NULL)")
+                << " to " << destFileName.c_str() << std::endl);
   this->ConfigureFile(inFileName, destFileName.c_str());
   return true;
 }

Index: cmCPackTarCompressGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cmCPackTarCompressGenerator.cxx	22 Aug 2006 13:20:44 -0000	1.6
+++ cmCPackTarCompressGenerator.cxx	30 Oct 2006 16:22:48 -0000	1.7
@@ -155,7 +155,8 @@
 int cmCPackTarCompressGenerator::CompressFiles(const char* outFileName,
   const char* toplevel, const std::vector<std::string>& files)
 {
-  cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: " << toplevel << std::endl);
+  cmCPackLogger(cmCPackLog::LOG_DEBUG, "Toplevel: "
+                << (toplevel ? toplevel : "(NULL)") << std::endl);
   cmCPackTarCompress_Data mydata(this);
   TAR *t;
   char buf[TAR_MAXPATHLEN];



More information about the Cmake-commits mailing list