Fixed a few minor dpkg settings

[apt.git] / apt-pkg / tagfile.cc

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index eb08403665e89d7fb6dcb9dbf4c845e40a3eedcb..bdfa302d8ca6b44aafddfc27264a817e6fc9ca7b 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: tagfile.cc,v 1.19 1998/12/14 02:23:47 jgg Exp $
+// $Id: tagfile.cc,v 1.21 1999/01/31 07:01:11 jgg Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -17,7 +17,7 @@
 
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <string>
 #include <stdio.h>
@@ -141,6 +141,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
    TagCount = 0;
    while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]))
    {
+      // Start a new index and add it to the hash
       if (isspace(Stop[0]) == 0)
       {
         Indexes[TagCount++] = Stop - Section;
@@ -154,9 +155,10 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       
       if (Stop == 0)
         return false;
-      for (; Stop[1] == '\r' && Stop < End; Stop++);
+      for (; Stop[1] == '\r' && Stop+1 < End; Stop++);
 
-      if (Stop[1] == '\n')
+      // Double newline or end of file 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++);