[Cmake-commits] [cmake-commits] hoffman committed cmSystemTools.cxx 1.414 1.415

cmake-commits at cmake.org cmake-commits at cmake.org
Sun Nov 8 10:19:41 EST 2009


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

Modified Files:
	cmSystemTools.cxx 
Log Message:
go back to running stat and put size check in


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.414
retrieving revision 1.415
diff -C 2 -d -r1.414 -r1.415
*** cmSystemTools.cxx	8 Nov 2009 02:08:38 -0000	1.414
--- cmSystemTools.cxx	8 Nov 2009 15:19:36 -0000	1.415
***************
*** 1801,1806 ****
        }
      // Set the name of the entry to the file name
!     archive_entry_set_pathname(entry, rp.c_str());
!     res = archive_read_disk_entry_from_file(disk, entry, -1, 0);
      CHECK_ARCHIVE_ERROR(res, "read disk entry:");
  
--- 1801,1808 ----
        }
      // Set the name of the entry to the file name
!     archive_entry_set_pathname(entry, rp.c_str()); 
!     struct stat s;           
!     stat(fileIt->c_str(), &s);   
!     archive_read_disk_entry_from_file(disk, entry, -1, &s);
      CHECK_ARCHIVE_ERROR(res, "read disk entry:");
  
***************
*** 1822,1826 ****
        {
        int wlen = archive_write_data(a, buff, len);
- #if 0
        if(wlen != len)
          { 
--- 1824,1827 ----
***************
*** 1834,1838 ****
          return false;
          }
- #endif
        len = fread(buff, 1, sizeof(buff), file);
        }
--- 1835,1838 ----



More information about the Cmake-commits mailing list