From 71857ccdb83b6374f7a791c2dae45ce9934a85af Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 11 Jul 2013 15:35:23 +0000 Subject: 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 --- tools/llvm-ar/llvm-ar.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tools/llvm-ar') diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 7b1dad091b..6578bfc04c 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"; -- cgit v1.2.3