diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2011-01-16 21:13:51 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2011-01-16 21:13:51 +0000 |
| commit | 3c98e14bc9b747b66c048b008f371ac03323c913 (patch) | |
| tree | cf0b70f9d896a177a0a0c027c60b02c083ca927e /lib/Archive/Archive.cpp | |
| parent | 6990433b56ab37a15991b1b01f46a0c2ce8adea5 (diff) | |
UnRevert "Revert the archive part of "Support/PathV2: Add identify_magic.""
This reverts commit dd103021a889a986a181ce36ed7b0e8dc9b645e1.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123595 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Archive/Archive.cpp')
| -rw-r--r-- | lib/Archive/Archive.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp index 3ee3cb25c5..1eab27d3eb 100644 --- a/lib/Archive/Archive.cpp +++ b/lib/Archive/Archive.cpp @@ -116,11 +116,10 @@ bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) { // Get the signature and status info const char* signature = (const char*) data; - std::string magic; + SmallString<4> magic; if (!signature) { - path.getMagicNumber(magic,4); + sys::fs::get_magic(path.str(), magic.capacity(), magic); signature = magic.c_str(); - std::string err; const sys::FileStatus *FSinfo = path.getFileStatus(false, ErrMsg); if (FSinfo) info = *FSinfo; |