From 003485a0b3705ca86b17411e32956f7df3282c20 Mon Sep 17 00:00:00 2001 From: Jeff Cohen Date: Wed, 15 Dec 2004 04:28:44 +0000 Subject: [PATCH] Make Win32 TimeValue::toString() re-entrant and work with mingw git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18954 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Win32/TimeValue.cpp | 14 +++++++++----- lib/System/Win32/TimeValue.inc | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lib/System/Win32/TimeValue.cpp b/lib/System/Win32/TimeValue.cpp index f45662948bc..de8f267089d 100644 --- a/lib/System/Win32/TimeValue.cpp +++ b/lib/System/Win32/TimeValue.cpp @@ -31,13 +31,17 @@ TimeValue TimeValue::now() { } std::string TimeValue::toString() const { - // Alas, asctime is not re-entrant on Windows... - +#ifdef __MINGW + time_t ourTime = time_t(this->toEpochTime()); + struct tm *lt = ::localtime(&ourTime); +#else __time64_t ourTime = this->toEpochTime(); - char* buffer = ::asctime(::_localtime64(&ourTime)); + struct tm *lt = ::_localtime64(&ourTime); +#endif - std::string result(buffer); - return result.substr(0,24); + char buffer[25]; + strftime(buffer, 25, "%a %b %d %H:%M:%S %Y", lt); + return std::string(buffer); } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab diff --git a/lib/System/Win32/TimeValue.inc b/lib/System/Win32/TimeValue.inc index f45662948bc..de8f267089d 100644 --- a/lib/System/Win32/TimeValue.inc +++ b/lib/System/Win32/TimeValue.inc @@ -31,13 +31,17 @@ TimeValue TimeValue::now() { } std::string TimeValue::toString() const { - // Alas, asctime is not re-entrant on Windows... - +#ifdef __MINGW + time_t ourTime = time_t(this->toEpochTime()); + struct tm *lt = ::localtime(&ourTime); +#else __time64_t ourTime = this->toEpochTime(); - char* buffer = ::asctime(::_localtime64(&ourTime)); + struct tm *lt = ::_localtime64(&ourTime); +#endif - std::string result(buffer); - return result.substr(0,24); + char buffer[25]; + strftime(buffer, 25, "%a %b %d %H:%M:%S %Y", lt); + return std::string(buffer); } // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab -- 2.34.1