[Cmake-commits] [cmake-commits] king committed cmCPackTGZGenerator.cxx 1.19.4.3 1.19.4.4 cmCPackTarCompressGenerator.cxx 1.9.4.1 1.9.4.2

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Nov 3 17:25:06 EST 2009


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

Modified Files:
      Tag: CMake-2-8
	cmCPackTGZGenerator.cxx cmCPackTarCompressGenerator.cxx 
Log Message:
CMake 2.8.0-rc5


Index: cmCPackTGZGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTGZGenerator.cxx,v
retrieving revision 1.19.4.3
retrieving revision 1.19.4.4
diff -C 2 -d -r1.19.4.3 -r1.19.4.4
*** cmCPackTGZGenerator.cxx	28 Oct 2009 16:15:38 -0000	1.19.4.3
--- cmCPackTGZGenerator.cxx	3 Nov 2009 22:25:03 -0000	1.19.4.4
***************
*** 219,223 ****
    };
  
!   // Ok, this libtar is not const safe. Make a non-const copy of outFileName
    char* realName = new char[ strlen(outFileName) + 1 ];
    strcpy(realName, outFileName);
--- 219,223 ----
    };
  
!   // This libtar is not const safe. Make a non-const copy of outFileName
    char* realName = new char[ strlen(outFileName) + 1 ];
    strcpy(realName, outFileName);
***************
*** 242,245 ****
--- 242,247 ----
      }
  
+   delete [] realName;
+ 
    std::vector<std::string>::const_iterator fileIt;
    for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
***************
*** 257,261 ****
          << strerror(errno) << std::endl);
        tar_close(t);
-       delete [] realName;
        return 0;
        }
--- 259,262 ----
***************
*** 266,270 ****
        << strerror(errno) << std::endl);
      tar_close(t);
-     delete [] realName;
      return 0;
      }
--- 267,270 ----
***************
*** 274,281 ****
      cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_close(): "
        << strerror(errno) << std::endl);
-     delete [] realName;
      return 0;
      }
-   delete [] realName;
    return 1;
  }
--- 274,279 ----

Index: cmCPackTarCompressGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CPack/cmCPackTarCompressGenerator.cxx,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -C 2 -d -r1.9.4.1 -r1.9.4.2
*** cmCPackTarCompressGenerator.cxx	1 Oct 2009 21:21:11 -0000	1.9.4.1
--- cmCPackTarCompressGenerator.cxx	3 Nov 2009 22:25:03 -0000	1.9.4.2
***************
*** 24,28 ****
  #include <cmcompress/cmcompress.h>
  #include <libtar/libtar.h>
- #include <memory> // auto_ptr
  #include <fcntl.h>
  #include <errno.h>
--- 24,27 ----
***************
*** 166,172 ****
    };
  
!   // Ok, this libtar is not const safe. for now use auto_ptr hack
    char* realName = new char[ strlen(outFileName) + 1 ];
-   std::auto_ptr<char> realNamePtr(realName);
    strcpy(realName, outFileName);
    int flags = O_WRONLY | O_CREAT;  
--- 165,170 ----
    };
  
!   // This libtar is not const safe. Make a non-const copy of outFileName
    char* realName = new char[ strlen(outFileName) + 1 ];
    strcpy(realName, outFileName);
    int flags = O_WRONLY | O_CREAT;  
***************
*** 186,192 ****
--- 184,193 ----
      cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem with tar_open(): "
        << strerror(errno) << std::endl);
+     delete [] realName;
      return 0;
      }
  
+   delete [] realName;
+ 
    std::vector<std::string>::const_iterator fileIt;
    for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )



More information about the Cmake-commits mailing list