From 9d39cb1d6418c5a25fa74f09e593794a4c8fd4b6 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 20 Jun 2013 13:23:48 +0000 Subject: [PATCH] Revert "Don't include directory names in archives." This reverts commit 184420. Investigating the bot failures. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184421 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Archive/directory.ll | 6 ------ tools/llvm-ar/Archive.cpp | 9 ++++++++- tools/llvm-ar/Archive.h | 9 +++++++-- tools/llvm-ar/ArchiveWriter.cpp | 17 +++++++++++++---- tools/llvm-ar/llvm-ar.cpp | 8 ++++++++ 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/test/Archive/directory.ll b/test/Archive/directory.ll index e10c3b43b82..f17ac5d36bd 100644 --- a/test/Archive/directory.ll +++ b/test/Archive/directory.ll @@ -1,8 +1,2 @@ ;RUN: not llvm-ar r %T/test.a . 2>&1 | FileCheck %s ;CHECK: . Is a directory - -;RUN: rm -f %T/test.a -;RUN: llvm-ar r %T/test.a %s -;RUN: llvm-ar t %T/test.a | FileCheck -check-prefix=MEMBERS %s -;MEMBERS-NOT: / -;MEMBERS: directory.ll diff --git a/tools/llvm-ar/Archive.cpp b/tools/llvm-ar/Archive.cpp index 520e410e1ac..cac65cf7706 100644 --- a/tools/llvm-ar/Archive.cpp +++ b/tools/llvm-ar/Archive.cpp @@ -97,8 +97,15 @@ bool ArchiveMember::replaceWith(StringRef newFile, std::string* ErrMsg) { else flags &= ~StringTableFlag; + // If it has a slash then it has a path + bool hasSlash = path.find('/') != std::string::npos; + if (hasSlash) + flags |= HasPathFlag; + else + flags &= ~HasPathFlag; + // If it has a slash or its over 15 chars then its a long filename format - if (path.length() > 15) + if (hasSlash || path.length() > 15) flags |= HasLongFilenameFlag; else flags &= ~HasLongFilenameFlag; diff --git a/tools/llvm-ar/Archive.h b/tools/llvm-ar/Archive.h index 37489992cfa..79d95873fde 100644 --- a/tools/llvm-ar/Archive.h +++ b/tools/llvm-ar/Archive.h @@ -52,8 +52,9 @@ class ArchiveMember : public ilist_node { SVR4SymbolTableFlag = 1, ///< Member is a SVR4 symbol table BSD4SymbolTableFlag = 2, ///< Member is a BSD4 symbol table BitcodeFlag = 4, ///< Member is bitcode - HasLongFilenameFlag = 8, ///< Member uses the long filename syntax - StringTableFlag = 16 ///< Member is an ar(1) format string table + HasPathFlag = 8, ///< Member has a full or partial path + HasLongFilenameFlag = 16, ///< Member uses the long filename syntax + StringTableFlag = 32 ///< Member is an ar(1) format string table }; /// @} @@ -124,6 +125,10 @@ class ArchiveMember : public ilist_node { /// @brief Determine if this member is a bitcode file. bool isBitcode() const { return flags&BitcodeFlag; } + /// @returns true iff the file name contains a path (directory) component. + /// @brief Determine if the member has a path + bool hasPath() const { return flags&HasPathFlag; } + /// Long filenames are an artifact of the ar(1) file format which allows /// up to sixteen characters in its header and doesn't allow a path /// separator character (/). To avoid this, a "long format" member name is diff --git a/tools/llvm-ar/ArchiveWriter.cpp b/tools/llvm-ar/ArchiveWriter.cpp index 332d55f0a44..5563b564b39 100644 --- a/tools/llvm-ar/ArchiveWriter.cpp +++ b/tools/llvm-ar/ArchiveWriter.cpp @@ -98,7 +98,13 @@ Archive::fillHeader(const ArchiveMember &mbr, ArchiveMemberHeader& hdr, sprintf(buffer,"%-12u", unsigned(secondsSinceEpoch)); memcpy(hdr.date,buffer,12); - std::string mbrPath = sys::path::filename(mbr.getPath()); + // Get rid of trailing blanks in the name + std::string mbrPath = mbr.getPath().str(); + size_t mbrLen = mbrPath.length(); + while (mbrLen > 0 && mbrPath[mbrLen-1] == ' ') { + mbrPath.erase(mbrLen-1,1); + mbrLen--; + } // Set the name field in one of its various flavors. bool writeLongName = false; @@ -159,8 +165,8 @@ bool Archive::addFileBefore(StringRef filePath, iterator where, ArchiveMember* mbr = new ArchiveMember(this); mbr->data = 0; - mbr->path = filePath; - sys::PathWithStatus PWS(filePath); + mbr->path = filePath.str(); + sys::PathWithStatus PWS(mbr->path); const sys::FileStatus *FSInfo = PWS.getFileStatus(false, ErrMsg); if (!FSInfo) { delete mbr; @@ -173,7 +179,10 @@ bool Archive::addFileBefore(StringRef filePath, iterator where, mbr->Size = FSInfo->getSize(); unsigned flags = 0; - if (sys::path::filename(filePath).size() > 15) + bool hasSlash = filePath.str().find('/') != std::string::npos; + if (hasSlash) + flags |= ArchiveMember::HasPathFlag; + if (hasSlash || filePath.str().length() > 15) flags |= ArchiveMember::HasLongFilenameFlag; sys::fs::file_magic type; diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 941b6310804..36bec4206d3 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -399,6 +399,14 @@ doExtract(std::string* ErrMsg) { if (Paths.empty() || (std::find(Paths.begin(), Paths.end(), I->getPath()) != Paths.end())) { + // Make sure the intervening directories are created + if (I->hasPath()) { + sys::Path dirs(I->getPath()); + dirs.eraseComponent(); + if (dirs.createDirectoryOnDisk(/*create_parents=*/true, ErrMsg)) + return true; + } + // Open up a file stream for writing std::ios::openmode io_mode = std::ios::out | std::ios::trunc | std::ios::binary;