Implement Win32 Path::getStatusInfo(), TimeValue::toString()

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18930 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/System/TimeValue.h b/include/llvm/System/TimeValue.h
index 93afca9f4b3f2edb895f8a5c2b2ff560c08bf975..e8a8365c4e886bf23079701992d96aed51db7b10 100644 (file)
--- a/include/llvm/System/TimeValue.h
+++ b/include/llvm/System/TimeValue.h
@@ -336,6 +336,14 @@ namespace sys {
       this->normalize();
     }
 
+    /// Converts the \p win32Time argument from Windows FILETIME to the
+    /// corresponding TimeValue and assigns that value to \p this.
+    /// @brief Convert seconds form Windows FILETIME to TimeValue
+    void fromWin32Time( uint64_t win32Time ) {
+      this->seconds_ = win32Time / 10000000 + Win32ZeroTime.seconds_;
+      this->nanos_ = NanoSecondsType(win32Time  % 10000000) * 100;
+    }
+
   /// @}
   /// @name Implementation
   /// @{

diff --git a/lib/System/Win32/Path.cpp b/lib/System/Win32/Path.cpp
index 43d553bbd99346f6d03a467f7fa517a3c9a046fd..88e20cd354f417fcc97b7fbb8daec5223afa5de0 100644 (file)
--- a/lib/System/Win32/Path.cpp
+++ b/lib/System/Win32/Path.cpp
@@ -287,13 +287,49 @@ Path::getLast() const {
   return path.substr(pos+1);
 }
 
+void
+Path::getStatusInfo(StatusInfo& info) const {
+  WIN32_FILE_ATTRIBUTE_DATA fi;
+  if (!GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi))
+    ThrowError(std::string(path) + ": Can't get status: ");
+
+  info.fileSize = fi.nFileSizeHigh;
+  info.fileSize <<= 32;
+  info.fileSize += fi.nFileSizeLow;
+
+  info.mode = 0777;    // Not applicable to Windows, so...
+  info.user = 9999;    // Not applicable to Windows, so...
+  info.group = 9999;   // Not applicable to Windows, so...
+
+  __int64 ft = *reinterpret_cast<__int64*>(&fi.ftLastWriteTime);
+  info.modTime.fromWin32Time(ft);
+
+  info.isDir = fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+  if (info.isDir && path[path.length() - 1] != '/')
+    path += '/';
+  else if (!info.isDir && path[path.length() - 1] == '/')
+    path.erase(path.length() - 1);
+}
+
 void Path::makeReadable() {
+  // All files are readable on Windows (ignoring security attributes).
 }
 
 void Path::makeWriteable() {
+  DWORD attr = GetFileAttributes(path.c_str());
+
+  // If it doesn't exist, we're done.
+  if (attr == INVALID_FILE_ATTRIBUTES)
+    return;
+
+  if (attr & FILE_ATTRIBUTE_READONLY) {
+    if (!SetFileAttributes(path.c_str(), attr & ~FILE_ATTRIBUTE_READONLY))
+      ThrowError(std::string(path) + ": Can't make file writable: ");
+  }
 }
 
 void Path::makeExecutable() {
+  // All files are executable on Windows (ignoring security attributes).
 }
 
 bool

diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 43d553bbd99346f6d03a467f7fa517a3c9a046fd..88e20cd354f417fcc97b7fbb8daec5223afa5de0 100644 (file)
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -287,13 +287,49 @@ Path::getLast() const {
   return path.substr(pos+1);
 }
 
+void
+Path::getStatusInfo(StatusInfo& info) const {
+  WIN32_FILE_ATTRIBUTE_DATA fi;
+  if (!GetFileAttributesEx(path.c_str(), GetFileExInfoStandard, &fi))
+    ThrowError(std::string(path) + ": Can't get status: ");
+
+  info.fileSize = fi.nFileSizeHigh;
+  info.fileSize <<= 32;
+  info.fileSize += fi.nFileSizeLow;
+
+  info.mode = 0777;    // Not applicable to Windows, so...
+  info.user = 9999;    // Not applicable to Windows, so...
+  info.group = 9999;   // Not applicable to Windows, so...
+
+  __int64 ft = *reinterpret_cast<__int64*>(&fi.ftLastWriteTime);
+  info.modTime.fromWin32Time(ft);
+
+  info.isDir = fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+  if (info.isDir && path[path.length() - 1] != '/')
+    path += '/';
+  else if (!info.isDir && path[path.length() - 1] == '/')
+    path.erase(path.length() - 1);
+}
+
 void Path::makeReadable() {
+  // All files are readable on Windows (ignoring security attributes).
 }
 
 void Path::makeWriteable() {
+  DWORD attr = GetFileAttributes(path.c_str());
+
+  // If it doesn't exist, we're done.
+  if (attr == INVALID_FILE_ATTRIBUTES)
+    return;
+
+  if (attr & FILE_ATTRIBUTE_READONLY) {
+    if (!SetFileAttributes(path.c_str(), attr & ~FILE_ATTRIBUTE_READONLY))
+      ThrowError(std::string(path) + ": Can't make file writable: ");
+  }
 }
 
 void Path::makeExecutable() {
+  // All files are executable on Windows (ignoring security attributes).
 }
 
 bool

diff --git a/lib/System/Win32/Program.cpp b/lib/System/Win32/Program.cpp
index 4aff5e969c81315c68acde80cd6306fdd9a6dbdb..92b024348c56cda5da071ac8420ae188cac86e1b 100644 (file)
--- a/lib/System/Win32/Program.cpp
+++ b/lib/System/Win32/Program.cpp
@@ -70,7 +70,7 @@ Program::FindProgramByName(const std::string& progName) {
 int 
 Program::ExecuteAndWait(const Path& path, 
                         const std::vector<std::string>& args,
-                        const char** env) {
+                        const char** envp) {
   if (!path.executable())
     throw path.toString() + " is not executable"; 
 
@@ -125,9 +125,8 @@ Program::ExecuteAndWait(const Path& path,
   PROCESS_INFORMATION pi;
   memset(&pi, 0, sizeof(pi));
 
-  LPVOID lpEnvironment = envp;
   if (!CreateProcess(path.c_str(), command, NULL, NULL, FALSE, 0,
-                     lpEnvironment, NULL, &si, &pi))
+                     envp, NULL, &si, &pi))
   {
     ThrowError(std::string("Couldn't execute program '") + 
                path.toString() + "'");

diff --git a/lib/System/Win32/Program.inc b/lib/System/Win32/Program.inc
index 4aff5e969c81315c68acde80cd6306fdd9a6dbdb..92b024348c56cda5da071ac8420ae188cac86e1b 100644 (file)
--- a/lib/System/Win32/Program.inc
+++ b/lib/System/Win32/Program.inc
@@ -70,7 +70,7 @@ Program::FindProgramByName(const std::string& progName) {
 int 
 Program::ExecuteAndWait(const Path& path, 
                         const std::vector<std::string>& args,
-                        const char** env) {
+                        const char** envp) {
   if (!path.executable())
     throw path.toString() + " is not executable"; 
 
@@ -125,9 +125,8 @@ Program::ExecuteAndWait(const Path& path,
   PROCESS_INFORMATION pi;
   memset(&pi, 0, sizeof(pi));
 
-  LPVOID lpEnvironment = envp;
   if (!CreateProcess(path.c_str(), command, NULL, NULL, FALSE, 0,
-                     lpEnvironment, NULL, &si, &pi))
+                     envp, NULL, &si, &pi))
   {
     ThrowError(std::string("Couldn't execute program '") + 
                path.toString() + "'");

diff --git a/lib/System/Win32/TimeValue.cpp b/lib/System/Win32/TimeValue.cpp
index eab776fc17fd52e88d5d3365ca83f3c8051f1513..f45662948bc106b5cdc7b9afbf12144283f2a869 100644 (file)
--- a/lib/System/Win32/TimeValue.cpp
+++ b/lib/System/Win32/TimeValue.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
+#include <time.h>
 
 namespace llvm {
 using namespace sys;
@@ -21,17 +22,22 @@ using namespace sys;
 //===----------------------------------------------------------------------===//
 
 TimeValue TimeValue::now() {
-  __int64 ft;
+  uint64_t ft;
   GetSystemTimeAsFileTime(reinterpret_cast<FILETIME *>(&ft));
 
-  return TimeValue(
-    static_cast<TimeValue::SecondsType>( ft / 10000000 +
-      Win32ZeroTime.seconds_ ),
-    static_cast<TimeValue::NanoSecondsType>( (ft % 10000000) * 100) );
+  TimeValue t(0, 0);
+  t.fromWin32Time(ft);
+  return t;
 }
 
 std::string TimeValue::toString() const {
-  return "Don't know how to conver time on Win32";
+  // Alas, asctime is not re-entrant on Windows...
+
+  __time64_t ourTime = this->toEpochTime();
+  char* buffer = ::asctime(::_localtime64(&ourTime));
+
+  std::string result(buffer);
+  return result.substr(0,24);
 }
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Win32/TimeValue.inc b/lib/System/Win32/TimeValue.inc
index eab776fc17fd52e88d5d3365ca83f3c8051f1513..f45662948bc106b5cdc7b9afbf12144283f2a869 100644 (file)
--- a/lib/System/Win32/TimeValue.inc
+++ b/lib/System/Win32/TimeValue.inc
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "Win32.h"
+#include <time.h>
 
 namespace llvm {
 using namespace sys;
@@ -21,17 +22,22 @@ using namespace sys;
 //===----------------------------------------------------------------------===//
 
 TimeValue TimeValue::now() {
-  __int64 ft;
+  uint64_t ft;
   GetSystemTimeAsFileTime(reinterpret_cast<FILETIME *>(&ft));
 
-  return TimeValue(
-    static_cast<TimeValue::SecondsType>( ft / 10000000 +
-      Win32ZeroTime.seconds_ ),
-    static_cast<TimeValue::NanoSecondsType>( (ft % 10000000) * 100) );
+  TimeValue t(0, 0);
+  t.fromWin32Time(ft);
+  return t;
 }
 
 std::string TimeValue::toString() const {
-  return "Don't know how to conver time on Win32";
+  // Alas, asctime is not re-entrant on Windows...
+
+  __time64_t ourTime = this->toEpochTime();
+  char* buffer = ::asctime(::_localtime64(&ourTime));
+
+  std::string result(buffer);
+  return result.substr(0,24);
 }
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab