* merged from apt--mvo

[apt.git] / apt-pkg / deb / debsrcrecords.cc

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index fa8407c510a0ad76966300afca07d25ead17d3e9..9e87ee5dadc8293aa9b3caf9b7ce5afdff966165 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: debsrcrecords.cc,v 1.2 1999/04/04 08:07:39 jgg Exp $
+// $Id: debsrcrecords.cc,v 1.6 2004/03/17 05:58:54 mdz Exp $
 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style
@@ -13,9 +13,13 @@
 #pragma implementation "apt-pkg/debsrcrecords.h"
 #endif 
 
+#include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+
+using std::max;
                                                                        /*}}}*/
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
@@ -23,43 +27,75 @@
 /* This member parses the binaries field into a pair of class arrays and
    returns a list of strings representing all of the components of the
    binaries field. The returned array need not be freed and will be
-   reused by the next Binaries function call. */
+   reused by the next Binaries function call. This function is commonly
+   used during scanning to find the right package */
 const char **debSrcRecordParser::Binaries()
 {
+   // This should use Start/Stop too, it is supposed to be efficient after all.
    string Bins = Sect.FindS("Binary");
-   char *Buf = Buffer;
-   unsigned int Bin = 0;
-   if (Bins.empty() == true)
+   if (Bins.empty() == true || Bins.length() >= 102400)
       return 0;
    
-   // Strip any leading spaces
-   string::const_iterator Start = Bins.begin();
-   for (; Start != Bins.end() && isspace(*Start) != 0; Start++);
+   if (Bins.length() >= BufSize)
+   {
+      delete [] Buffer;
+      // allocate new size based on buffer (but never smaller than 4000)
+      BufSize = max((unsigned long)4000, max((unsigned long)Bins.length()+1,2*BufSize));
+      Buffer = new char[BufSize];
+   }
+
+   strcpy(Buffer,Bins.c_str());
+   if (TokSplitString(',',Buffer,StaticBinList,
+                     sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)
+      return 0;
+
+   return (const char **)StaticBinList;
+}
+                                                                       /*}}}*/
+// SrcRecordParser::BuildDepends - Return the Build-Depends information        /*{{{*/
+// ---------------------------------------------------------------------
+/* This member parses the build-depends information and returns a list of 
+   package/version records representing the build dependency. The returned 
+   array need not be freed and will be reused by the next call to this 
+   function */
+bool debSrcRecordParser::BuildDepends(vector<pkgSrcRecords::Parser::BuildDepRec> &BuildDeps, bool ArchOnly)
+{
+   unsigned int I;
+   const char *Start, *Stop;
+   BuildDepRec rec;
+   const char *fields[] = {"Build-Depends", 
+                           "Build-Depends-Indep",
+                          "Build-Conflicts",
+                          "Build-Conflicts-Indep"};
 
-   string::const_iterator Pos = Start;
-   while (Pos != Bins.end())
+   BuildDeps.clear();
+
+   for (I = 0; I < 4; I++) 
    {
-      // Skip to the next ','
-      for (; Pos != Bins.end() && *Pos != ','; Pos++);
-      
-      // Back remove spaces
-      string::const_iterator End = Pos;
-      for (; End > Start && (End[-1] == ',' || isspace(End[-1]) != 0); End--);
-      
-      // Stash the string
-      memcpy(Buf,Start,End-Start);
-      StaticBinList[Bin] = Buf;
-      Bin++;
-      Buf += End-Start;
-      *Buf++ = 0;
+      if (ArchOnly && (I == 1 || I == 3))
+         continue;
+
+      if (Sect.Find(fields[I], Start, Stop) == false)
+         continue;
       
-      // Advance pos
-      for (; Pos != Bins.end() && (*Pos == ',' || isspace(*Pos) != 0); Pos++);
-      Start = Pos;
+      while (1)
+      {
+         Start = debListParser::ParseDepends(Start, Stop, 
+                    rec.Package,rec.Version,rec.Op,true);
+        
+         if (Start == 0) 
+            return _error->Error("Problem parsing dependency: %s", fields[I]);
+        rec.Type = I;
+
+        if (rec.Package != "")
+           BuildDeps.push_back(rec);
+        
+        if (Start == Stop) 
+           break;
+      }         
    }
    
-   StaticBinList[Bin] = 0;
-   return StaticBinList;
+   return true;
 }
                                                                        /*}}}*/
 // SrcRecordParser::Files - Return a list of files for this source     /*{{{*/
@@ -75,10 +111,10 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
       return false;
 
    // Stash the / terminated directory prefix
-   string Base = Sect.FindS("Directory:");
+   string Base = Sect.FindS("Directory");
    if (Base.empty() == false && Base[Base.length()-1] != '/')
       Base += '/';
-       
+   
    // Iterate over the entire list grabbing each triplet
    const char *C = Files.c_str();
    while (*C != 0)
@@ -95,6 +131,25 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
       // Parse the size and append the directory
       F.Size = atoi(Size.c_str());
       F.Path = Base + F.Path;
+      
+      // Try to guess what sort of file it is we are getting.
+      string::size_type Pos = F.Path.length()-1;
+      while (1)
+      {
+        string::size_type Tmp = F.Path.rfind('.',Pos);
+        if (Tmp == string::npos)
+           break;
+        F.Type = string(F.Path,Tmp+1,Pos-Tmp);
+        
+        if (F.Type == "gz" || F.Type == "bz2")
+        {
+           Pos = Tmp-1;
+           continue;
+        }
+        
+        break;
+      }
+      
       List.push_back(F);
    }