6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-20 14:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Handle UIDs and GIDs that don't fit in 6 decimal places.

Browse Source 
Newer unix systems have 32 bit uid and gid types, but the archive format was
not updated. Fortunately, these fields are not normally used. Just truncate
the data to fit in 6 chars.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199223 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-01-14 17:02:09 +00:00
parent bb34ce84fd
commit 0972d2777c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/llvm-ar/llvm-ar.cpp
View File

@ -578,14 +578,21 @@ computeNewArchiveMembers(ArchiveOperation Operation,
}
template <typename T>
static void printWithSpacePadding(raw_ostream &OS, T Data, unsigned Size) {
static void printWithSpacePadding(raw_fd_ostream &OS, T Data, unsigned Size,
bool MayTruncate = false) {
uint64_t OldPos = OS.tell();
OS << Data;
unsigned SizeSoFar = OS.tell() - OldPos;
assert(Size >= SizeSoFar && "Data doesn't fit in Size");
unsigned Remaining = Size - SizeSoFar;
for (unsigned I = 0; I < Remaining; ++I)
OS << ' ';
if (Size > SizeSoFar) {
unsigned Remaining = Size - SizeSoFar;
for (unsigned I = 0; I < Remaining; ++I)
OS << ' ';
} else if (Size < SizeSoFar) {
assert(MayTruncate && "Data doesn't fit in Size");
// Some of the data this is used for (like UID) can be larger than the
// space available in the archive format. Truncate in that case.
OS.seek(OldPos + Size);
}
}
static void print32BE(raw_fd_ostream &Out, unsigned Val) {
@ -600,8 +607,8 @@ static void printRestOfMemberHeader(raw_fd_ostream &Out,
unsigned GID, unsigned Perms,
unsigned Size) {
printWithSpacePadding(Out, ModTime.toEpochTime(), 12);
printWithSpacePadding(Out, UID, 6);
printWithSpacePadding(Out, GID, 6);
printWithSpacePadding(Out, UID, 6, true);
printWithSpacePadding(Out, GID, 6, true);
printWithSpacePadding(Out, format("%o", Perms), 8);
printWithSpacePadding(Out, Size, 10);
Out << "`\n";