* slighly more debug output, renamed "--automatic-remove" to "--auto-remove"

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

diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 7a06e30b972b87a2a4515c43f767eece9b31e2b0..cac36c2e6b994c9a1203eeba2243e0362d985a84 100644 (file)
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debsrcrecords.cc,v 1.3 1999/04/07 05:30:18 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
 /* ######################################################################
    
    Debian Source Package Records - Parser implementation for Debian style


@@ -13,9 +13,11 @@
 #pragma implementation "apt-pkg/debsrcrecords.h"
 #endif 
 
 #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/debsrcrecords.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/configuration.h>

                                                                        /*}}}*/
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/
                                                                        /*}}}*/
 
 // SrcRecordParser::Binaries - Return the binaries field               /*{{{*/


@@ -23,43 +25,87 @@
 /* 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
 /* 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()
 {
 const char **debSrcRecordParser::Binaries()
 {

+   // This should use Start/Stop too, it is supposed to be efficient after all.

    string Bins = Sect.FindS("Binary");
    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;
    
       return 0;
    

-   // Strip any leading spaces
-   string::const_iterator Start = Bins.begin();
-   for (; Start != Bins.end() && isspace(*Start) != 0; Start++);
+   // Workaround for #236688.  Only allocate a new buffer if the field
+   // is large, to avoid a performance penalty
+   char *BigBuf = NULL;
+   char *Buf;
+   if (Bins.length() > sizeof(Buffer))
+   {
+      BigBuf = new char[Bins.length()];
+      Buf = BigBuf;
+   }
+   else
+   {
+      Buf = Buffer;
+   }

 
 

-   string::const_iterator Pos = Start;
-   while (Pos != Bins.end())
+   strcpy(Buf,Bins.c_str());
+   if (TokSplitString(',',Buf,StaticBinList,
+                     sizeof(StaticBinList)/sizeof(StaticBinList[0])) == false)

    {
    {

-      // 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 (BigBuf != NULL)
+         delete BigBuf;
+      return 0;
+   }
+
+   if (BigBuf != NULL)
+      delete BigBuf;
+   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"};
+
+   BuildDeps.clear();
+
+   for (I = 0; I < 4; I++) 
+   {
+      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     /*{{{*/
 }
                                                                        /*}}}*/
 // SrcRecordParser::Files - Return a list of files for this source     /*{{{*/


@@ -95,6 +141,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;
       // 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);
    }
    
       List.push_back(F);
    }