[Cmake-commits] CMake branch, next, updated. v3.0.0-4033-gf547928

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f54792849a4d32c124e8a231af42873e9700cea1 (commit)
       via  9571214e55cb8b86dadb26b6b1d696ef488bdd4b (commit)
       via  949715f027f738cb3558b69f5288f7655945ea80 (commit)
      from  76ace1c96f1112d54d3de915296b7c47b659df54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f54792849a4d32c124e8a231af42873e9700cea1
commit f54792849a4d32c124e8a231af42873e9700cea1
Merge: 76ace1c 9571214
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Jul 1 08:40:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 1 08:40:06 2014 -0400

    Merge topic 'encoding-bugs' into next
    
    9571214e Encoding: Replace some system calls with kwsys calls which handle unicode.
    949715f0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9571214e55cb8b86dadb26b6b1d696ef488bdd4b
commit 9571214e55cb8b86dadb26b6b1d696ef488bdd4b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Jul 1 06:37:21 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Jul 1 06:38:35 2014 -0600

    Encoding: Replace some system calls with kwsys calls which handle unicode.

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 61c6eb3..e47365a 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3172,15 +3172,7 @@ cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
     return false;
     }
 
-  struct stat st;
-  if(::stat(filename.c_str(), &st))
-    {
-    std::string errStr = "UPLOAD cannot stat file '";
-    errStr += filename + "'.";
-    this->SetError(errStr);
-    fclose(fin);
-    return false;
-    }
+  unsigned long file_size = cmsys::SystemTools::FileLength(filename.c_str());
 
   ::CURL *curl;
   ::curl_global_init(CURL_GLOBAL_DEFAULT);
@@ -3270,7 +3262,7 @@ cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
 
   // and give the size of the upload (optional)
   res = ::curl_easy_setopt(curl,
-    CURLOPT_INFILESIZE, static_cast<long>(st.st_size));
+    CURLOPT_INFILESIZE, static_cast<long>(file_size));
   check_curl_result(res, "UPLOAD cannot set input file size: ");
 
   res = ::curl_easy_perform(curl);
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index ac26503..6fd6ab7 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -33,15 +33,13 @@ std::string cmTimestamp::CurrentTime(
 std::string cmTimestamp::FileModificationTime(const char* path,
   const std::string& formatString, bool utcFlag)
 {
-  struct stat info;
-  memset(&info, 0, sizeof(info));
-
-  if(stat(path, &info) != 0)
+  if(!cmsys::SystemTools::FileExists(path))
     {
     return std::string();
     }
 
-  return CreateTimestampFromTimeT(info.st_mtime, formatString, utcFlag);
+  time_t mtime = cmsys::SystemTools::ModifiedTime(path);
+  return CreateTimestampFromTimeT(mtime, formatString, utcFlag);
 }
 
 //----------------------------------------------------------------------------

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmFileCommand.cxx  |   12 ++----------
 Source/cmTimestamp.cxx    |    8 +++-----
 3 files changed, 6 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake