// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: tagfile.cc,v 1.27 2001/02/23 06:41:55 jgg Exp $
+// $Id: tagfile.cc,v 1.37.2.2 2003/12/31 16:02:30 mdz Exp $
/* ######################################################################
Fast scanner for RFC-822 type header information
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/tagfile.h"
-#endif
-
#include <apt-pkg/tagfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <string>
#include <stdio.h>
+#include <ctype.h>
/*}}}*/
+using std::string;
+
// TagFile::pkgTagFile - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : Fd(*pFd), Size(Size)
+pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
+ Fd(*pFd),
+ Size(Size)
{
if (Fd.IsOpen() == false)
{
Buffer = 0;
Start = End = Buffer = 0;
- Left = 0;
+ Done = true;
iOffset = 0;
return;
}
Buffer = new char[Size];
Start = End = Buffer;
- Left = Fd.Size();
- TotalSize = Fd.Size();
+ Done = false;
iOffset = 0;
Fill();
}
delete [] Buffer;
}
/*}}}*/
+// TagFile::Resize - Resize the internal buffer /*{{{*/
+// ---------------------------------------------------------------------
+/* Resize the internal buffer (double it in size). Fail if a maximum size
+ * size is reached.
+ */
+bool pkgTagFile::Resize()
+{
+ char *tmp;
+ unsigned long EndSize = End - Start;
+
+ // fail is the buffer grows too big
+ if(Size > 1024*1024+1)
+ return false;
+
+ // get new buffer and use it
+ tmp = new char[2*Size];
+ memcpy(tmp, Buffer, Size);
+ Size = Size*2;
+ delete [] Buffer;
+ Buffer = tmp;
+
+ // update the start/end pointers to the new buffer
+ Start = Buffer;
+ End = Start + EndSize;
+ return true;
+}
+
// TagFile::Step - Advance to the next section /*{{{*/
// ---------------------------------------------------------------------
-/* If the Section Scanner fails we refill the buffer and try again. */
+/* If the Section Scanner fails we refill the buffer and try again.
+ * If that fails too, double the buffer size and try again until a
+ * maximum buffer is reached.
+ */
bool pkgTagFile::Step(pkgTagSection &Tag)
{
- if (Tag.Scan(Start,End - Start) == false)
+ while (Tag.Scan(Start,End - Start) == false)
{
if (Fill() == false)
return false;
- if (Tag.Scan(Start,End - Start) == false)
- return _error->Error(_("Unable to parse package file %s (1)"),Fd.Name().c_str());
- }
+ if(Tag.Scan(Start,End - Start))
+ break;
+
+ if (Resize() == false)
+ return _error->Error(_("Unable to parse package file %s (1)"),
+ Fd.Name().c_str());
+ }
Start += Tag.size();
iOffset += Tag.size();
Tag.Trim();
-
return true;
}
/*}}}*/
bool pkgTagFile::Fill()
{
unsigned long EndSize = End - Start;
+ unsigned long Actual = 0;
memmove(Buffer,Start,EndSize);
Start = Buffer;
End = Buffer + EndSize;
- if (Left == 0)
+ if (Done == false)
+ {
+ // See if only a bit of the file is left
+ if (Fd.Read(End,Size - (End - Buffer),&Actual) == false)
+ return false;
+ if (Actual != Size - (End - Buffer))
+ Done = true;
+ End += Actual;
+ }
+
+ if (Done == true)
{
- if (EndSize <= 3)
+ if (EndSize <= 3 && Actual == 0)
return false;
if (Size - (End - Buffer) < 4)
return true;
return true;
}
- // See if only a bit of the file is left
- if (Left < Size - (End - Buffer))
- {
- if (Fd.Read(End,Left) == false)
- return false;
-
- End += Left;
- Left = 0;
- }
- else
- {
- if (Fd.Read(End,Size - (End - Buffer)) == false)
- return false;
-
- Left -= Size - (End - Buffer);
- End = Buffer + Size;
- }
return true;
}
/*}}}*/
// Reposition and reload..
iOffset = Offset;
- Left = TotalSize - Offset;
+ Done = false;
if (Fd.Seek(Offset) == false)
return false;
End = Start = Buffer;
// ---------------------------------------------------------------------
/* This looks for the first double new line in the data stream. It also
indexes the tags in the section. This very simple hash function for the
- first 3 letters gives very good performance on the debian package files */
+ last 8 letters gives very good performance on the debian package files */
inline static unsigned long AlphaHash(const char *Text, const char *End = 0)
{
unsigned long Res = 0;
for (; Text != End && *Text != ':' && *Text != 0; Text++)
- Res = (unsigned long)(*Text) ^ (Res << 2);
+ Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1);
return Res & 0xFF;
}
return false;
TagCount = 0;
- while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
+ while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
{
// Start a new index and add it to the hash
if (isspace(Stop[0]) == 0)
if (Stop == 0)
return false;
- for (; Stop[1] == '\r' && Stop+1 < End; Stop++);
+ for (; Stop+1 < End && Stop[1] == '\r'; Stop++);
// Double newline marks the end of the record
if (Stop+1 < End && Stop[1] == '\n')
{
Indexes[TagCount] = Stop - Section;
- for (; (Stop[0] == '\n' || Stop[0] == '\r') && Stop < End; Stop++);
+ for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
return true;
}
"Recommends",
"Suggests",
"Conflicts",
+ "Breaks",
"Conffiles",
"Filename",
"Size",
"MD5Sum",
+ "SHA1",
+ "SHA256",
"MSDOS-Filename", // Obsolete
"Description",
0};
projects / apt.git / blobdiff