6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-02 07:11:49 +00:00
Code Issues Projects Releases Wiki Activity

Despite documentation to the contrary, Mac OSX and BSD 4.4 archive formats

Browse Source 
*do* include the length of the long file in the length of the member and
they are *not* null terminated.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17909 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-11-17 16:13:11 +00:00
parent ced8222405
commit dd95e8d71e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Archive/ArchiveReader.cpp
View File

@ -97,7 +97,8 @@ Archive::parseMemberHeader(const char*& At, const char* End) {
if (isdigit(Hdr->name[3])) { if (isdigit(Hdr->name[3])) {
unsigned len = atoi(&Hdr->name[3]); unsigned len = atoi(&Hdr->name[3]);
pathname.assign(At,len); pathname.assign(At,len);
At += len + 1; // terminated by \n At += len;
MemberSize -= len;
flags |= ArchiveMember::HasLongFilenameFlag; flags |= ArchiveMember::HasLongFilenameFlag;
} else } else
throw std::string("invalid long filename"); throw std::string("invalid long filename");
@ -155,7 +156,7 @@ Archive::parseMemberHeader(const char*& At, const char* End) {
default: default:
char* slash = (char*) memchr(Hdr->name,'/',16); char* slash = (char*) memchr(Hdr->name,'/',16);
if (slash == 0) if (slash == 0)
throw std::string("missing name terminator"); slash = Hdr->name + 16;
pathname.assign(Hdr->name,slash-Hdr->name); pathname.assign(Hdr->name,slash-Hdr->name);
break; break;
} }

5
lib/Bytecode/Archive/ArchiveReader.cpp
View File

@ -97,7 +97,8 @@ Archive::parseMemberHeader(const char*& At, const char* End) {
if (isdigit(Hdr->name[3])) { if (isdigit(Hdr->name[3])) {
unsigned len = atoi(&Hdr->name[3]); unsigned len = atoi(&Hdr->name[3]);
pathname.assign(At,len); pathname.assign(At,len);
At += len + 1; // terminated by \n At += len;
MemberSize -= len;
flags |= ArchiveMember::HasLongFilenameFlag; flags |= ArchiveMember::HasLongFilenameFlag;
} else } else
throw std::string("invalid long filename"); throw std::string("invalid long filename");
@ -155,7 +156,7 @@ Archive::parseMemberHeader(const char*& At, const char* End) {
default: default:
char* slash = (char*) memchr(Hdr->name,'/',16); char* slash = (char*) memchr(Hdr->name,'/',16);
if (slash == 0) if (slash == 0)
throw std::string("missing name terminator"); slash = Hdr->name + 16;
pathname.assign(Hdr->name,slash-Hdr->name); pathname.assign(Hdr->name,slash-Hdr->name);
break; break;
} }