diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-11 15:35:23 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-11 15:35:23 +0000 |
commit | 71857ccdb83b6374f7a791c2dae45ce9934a85af (patch) | |
tree | 0114117501240cf3ea150ef640d0c388fb07a1bc | |
parent | 11eb51e23935e22e1cb7b346c45713e8c9169c84 (diff) | |
download | external_llvm-71857ccdb83b6374f7a791c2dae45ce9934a85af.zip external_llvm-71857ccdb83b6374f7a791c2dae45ce9934a85af.tar.gz external_llvm-71857ccdb83b6374f7a791c2dae45ce9934a85af.tar.bz2 |
Fix a FIXME about the format and add a test.
While at it, use strftime on Unix too and use the thread safe versions
of localtime.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186090 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Support/Unix/TimeValue.inc | 19 | ||||
-rw-r--r-- | lib/Support/Windows/TimeValue.inc | 23 | ||||
-rw-r--r-- | test/Object/archive-toc.test | 31 | ||||
-rw-r--r-- | tools/llvm-ar/llvm-ar.cpp | 12 |
4 files changed, 44 insertions, 41 deletions
diff --git a/lib/Support/Unix/TimeValue.inc b/lib/Support/Unix/TimeValue.inc index df8558b..80532b0 100644 --- a/lib/Support/Unix/TimeValue.inc +++ b/lib/Support/Unix/TimeValue.inc @@ -22,18 +22,13 @@ namespace llvm { using namespace sys; std::string TimeValue::str() const { - char buffer[32]; - - time_t ourTime = time_t(this->toEpochTime()); -#ifdef __hpux -// note that the following line needs -D_REENTRANT on HP-UX to be picked up - asctime_r(localtime(&ourTime), buffer); -#else - ::asctime_r(::localtime(&ourTime), buffer); -#endif - - std::string result(buffer); - return result.substr(0,24); + time_t OurTime = time_t(this->toEpochTime()); + struct tm Storage; + struct tm *LT = ::localtime_r(&OurTime, &Storage); + assert(LT); + char Buffer[25]; + strftime(Buffer, 25, "%b %e %H:%M %Y", LT); + return std::string(Buffer); } TimeValue TimeValue::now() { diff --git a/lib/Support/Windows/TimeValue.inc b/lib/Support/Windows/TimeValue.inc index 1227552..32983be 100644 --- a/lib/Support/Windows/TimeValue.inc +++ b/lib/Support/Windows/TimeValue.inc @@ -31,20 +31,15 @@ TimeValue TimeValue::now() { } std::string TimeValue::str() const { -#ifdef __MINGW32__ - // This ban may be lifted by either: - // (i) a future MinGW version other than 1.0 inherents the __time64_t type, or - // (ii) configure tests for either the time_t or __time64_t type. - time_t ourTime = time_t(this->toEpochTime()); - struct tm *lt = ::localtime(&ourTime); -#else - __time64_t ourTime = this->toEpochTime(); - struct tm *lt = ::_localtime64(&ourTime); -#endif - - char buffer[25]; - strftime(buffer, 25, "%a %b %d %H:%M:%S %Y", lt); - return std::string(buffer); + struct tm LT; + __time64_t OurTime = this->toEpochTime(); + errno_t Error = ::_localtime64_s(<, &OurTime); + assert(!Error); + + char Buffer[25]; + // FIXME: the windows version of strftime doesn't support %e + strftime(Buffer, 25, "%b %d %H:%M %Y", <); + return std::string(Buffer); } diff --git a/test/Object/archive-toc.test b/test/Object/archive-toc.test index e11dac5..f99588d 100644 --- a/test/Object/archive-toc.test +++ b/test/Object/archive-toc.test @@ -1,16 +1,31 @@ +REQUIRES: shell + +RUN: export TZ=GMT + Test reading an archive created by gnu ar -RUN: llvm-ar t %p/Inputs/GNU.a | FileCheck %s +RUN: llvm-ar tv %p/Inputs/GNU.a | FileCheck %s --check-prefix=GNU -strict-whitespace + +GNU: rw-r--r-- 500/500 8 Nov 19 02:57 2004 evenlen +GNU-NEXT: rw-r--r-- 500/500 7 Nov 19 02:57 2004 oddlen +GNU-NEXT: rwxr-xr-x 500/500 1465 Nov 19 03:01 2004 very_long_bytecode_file_name.bc +GNU-NEXT: rw-r--r-- 500/500 2280 Nov 19 03:04 2004 IsNAN.o + Test reading an archive createdy by Mac OS X ar -RUN: llvm-ar t %p/Inputs/MacOSX.a | FileCheck %s +RUN: llvm-ar tv %p/Inputs/MacOSX.a | FileCheck %s --check-prefix=OSX -strict-whitespace + +OSX: rw-r--r-- 501/501 8 Nov 19 02:57 2004 evenlen +OSX-NEXT: rw-r--r-- 501/501 8 Nov 19 02:57 2004 oddlen +OSX-NEXT: rw-r--r-- 502/502 1465 Feb 4 06:59 2010 very_long_bytecode_file_name.bc +OSX-NEXT: rw-r--r-- 501/501 2280 Nov 19 04:32 2004 IsNAN.o Test reading an archive created on Solaris by /usr/ccs/bin/ar -RUN: llvm-ar t %p/Inputs/SVR4.a | FileCheck %s +RUN: llvm-ar tv %p/Inputs/SVR4.a | FileCheck %s -strict-whitespace Test reading an archive created on Solaris by /usr/xpg4/bin/ar -RUN: llvm-ar t %p/Inputs/xpg4.a | FileCheck %s +RUN: llvm-ar tv %p/Inputs/xpg4.a | FileCheck %s -strict-whitespace -CHECK: evenlen -CHECK-NEXT: oddlen -CHECK-NEXT: very_long_bytecode_file_name.bc -CHECK-NEXT: IsNAN.o +CHECK: rw-r--r-- 1002/102 8 Nov 19 03:24 2004 evenlen +CHECK-NEXT: rw-r--r-- 1002/102 7 Nov 19 03:24 2004 oddlen +CHECK-NEXT: rwxr-xr-x 1002/102 1465 Nov 19 03:24 2004 very_long_bytecode_file_name.bc +CHECK-NEXT: rw-r--r-- 1002/102 2280 Nov 19 03:24 2004 IsNAN.o diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 7b1dad0..6578bfc 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -325,17 +325,15 @@ doDisplayTable(std::string* ErrMsg) { if (Paths.empty() || (std::find(Paths.begin(), Paths.end(), I->getPath()) != Paths.end())) { if (Verbose) { - // FIXME: Output should be this format: - // Zrw-r--r-- 500/ 500 525 Nov 8 17:42 2004 Makefile - outs() << " "; unsigned mode = I->getMode(); printMode((mode >> 6) & 007); printMode((mode >> 3) & 007); printMode(mode & 007); - outs() << " " << format("%4u", I->getUser()); - outs() << "/" << format("%4u", I->getGroup()); - outs() << " " << format("%8u", I->getSize()); - outs() << " " << format("%20s", I->getModTime().str().substr(4).c_str()); + outs() << ' ' << I->getUser(); + outs() << "/" << I->getGroup(); + outs() << ' ' << format("%6u", I->getSize()); + sys::TimeValue ModTime = I->getModTime(); + outs() << " " << ModTime.str(); outs() << " " << I->getPath().str() << "\n"; } else { outs() << I->getPath().str() << "\n"; |