cleanup the error header a bit by moving the printf-macros out

[apt.git] / ftparchive / override.cc

diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index 93cc34e8581177d16534bf4f74120bfde2d1736b..3cf10b89b5e7601c0c2c11b86321d73a51b0dccc 100644 (file)
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: override.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: override.cc,v 1.4 2003/02/10 07:34:41 doogie Exp $

 /* ######################################################################
 
    Override
 /* ######################################################################
 
    Override


@@ -10,12 +10,9 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "override.h"
-#endif
-

 #include "override.h"
     
 #include "override.h"
     

+#include <apti18n.h>

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 


@@ -27,14 +24,14 @@
 // Override::ReadOverride - Read the override file                     /*{{{*/
 // ---------------------------------------------------------------------
 /* This parses the override file and reads it into the map */
 // Override::ReadOverride - Read the override file                     /*{{{*/
 // ---------------------------------------------------------------------
 /* This parses the override file and reads it into the map */

-bool Override::ReadOverride(string File,bool Source)
+bool Override::ReadOverride(string const &File,bool const &Source)

 {
    if (File.empty() == true)
       return true;
    
    FILE *F = fopen(File.c_str(),"r");
    if (F == 0)
 {
    if (File.empty() == true)
       return true;
    
    FILE *F = fopen(File.c_str(),"r");
    if (F == 0)

-      return _error->Errno("fopen","Unable to open %s",File.c_str());
+      return _error->Errno("fopen",_("Unable to open %s"),File.c_str());

    
    char Line[500];
    unsigned long Counter = 0;
    
    char Line[500];
    unsigned long Counter = 0;


@@ -60,7 +57,7 @@ bool Override::ReadOverride(string File,bool Source)
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {

-        _error->Warning("Malformed override %s line %lu #1",File.c_str(),
+        _error->Warning(_("Malformed override %s line %lu #1"),File.c_str(),

                         Counter);
         continue;
       }      
                         Counter);
         continue;
       }      


@@ -74,7 +71,7 @@ bool Override::ReadOverride(string File,bool Source)
         for (; isspace(*End) == 0 && *End != 0; End++);
         if (*End == 0)
         {
         for (; isspace(*End) == 0 && *End != 0; End++);
         if (*End == 0)
         {

-           _error->Warning("Malformed override %s line %lu #2",File.c_str(),
+           _error->Warning(_("Malformed override %s line %lu #2"),File.c_str(),

                            Counter);
            continue;
         }
                            Counter);
            continue;
         }


@@ -88,12 +85,12 @@ bool Override::ReadOverride(string File,bool Source)
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {
       for (; isspace(*End) == 0 && *End != 0; End++);
       if (*End == 0)
       {

-        _error->Warning("Malformed override %s line %lu #3",File.c_str(),
+        _error->Warning(_("Malformed override %s line %lu #3"),File.c_str(),

                         Counter);
         continue;
       }      
       *End = 0;
                         Counter);
         continue;
       }      
       *End = 0;

-      Itm.Section = Start;
+      Itm.FieldOverride["Section"] = Start;

 
       // Source override files only have the two columns
       if (Source == true)
 
       // Source override files only have the two columns
       if (Source == true)


@@ -127,18 +124,130 @@ bool Override::ReadOverride(string File,bool Source)
    }
 
    if (ferror(F))
    }
 
    if (ferror(F))

-      _error->Errno("fgets","Failed to read the override file %s",File.c_str());
+      _error->Errno("fgets",_("Failed to read the override file %s"),File.c_str());

    fclose(F);
    return true;
 }
                                                                        /*}}}*/
    fclose(F);
    return true;
 }
                                                                        /*}}}*/

+// Override::ReadExtraOverride - Read the extra override file          /*{{{*/
+// ---------------------------------------------------------------------
+/* This parses the extra override file and reads it into the map */
+bool Override::ReadExtraOverride(string const &File,bool const &Source)
+{
+   if (File.empty() == true)
+      return true;
+   
+   FILE *F = fopen(File.c_str(),"r");
+   if (F == 0)
+      return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
+  
+   char Line[500];
+   unsigned long Counter = 0;
+   while (fgets(Line,sizeof(Line),F) != 0)
+   {
+      Counter++;
+
+      // Silence 
+      for (char *I = Line; *I != 0; I++)
+        if (*I == '#')
+           *I = 0;
+
+      // Strip space leading up to the package name, skip blank lines
+      char *Pkg = Line;
+      for (; isspace(*Pkg) && *Pkg != 0;Pkg++);
+      if (Pkg == 0)
+        continue;
+
+      // Find the package and zero..
+      char *End = Pkg;
+      for (; isspace(*End) == 0 && *End != 0; End++);
+      if (*End == 0)
+      {
+        _error->Warning(_("Malformed override %s line %lu #1"),File.c_str(),
+                        Counter);
+        continue;
+      }      
+      *End = 0;
+
+      // Find the field
+      for (End++; isspace(*End) != 0 && *End != 0; End++);
+      char *Field = End;
+      for (; isspace(*End) == 0 && *End != 0; End++);
+      if (*End == 0)
+      {
+        _error->Warning(_("Malformed override %s line %lu #2"),File.c_str(),
+                        Counter);
+        continue;
+      }
+      *End = 0;
+      
+      // Find the field value 
+      for (End++; isspace(*End) != 0 && *End != 0; End++);
+      char *Value = End;
+      for (; *End != 0; End++);
+      for (; isspace(*(End-1)) && End > Value; End--);
+      if (End == Value)
+      {
+        _error->Warning(_("Malformed override %s line %lu #3"),File.c_str(),
+                        Counter);
+        continue;
+      }      
+      *End = 0;
+
+      Mapping[Pkg].FieldOverride[Field] = Value;
+   }
+
+   if (ferror(F))
+      _error->Errno("fgets",_("Failed to read the override file %s"),File.c_str());
+   fclose(F);
+   return true;
+}
+                                                                       /*}}}*/
+
+// Override::GetItem - Get a architecture specific item        /*{{{*/
+// ---------------------------------------------------------------------
+/* Returns a override item for the given package and the given architecture.
+ * Treats "all" special
+ */
+Override::Item* Override::GetItem(string const &Package, string const &Architecture)
+{
+   map<string,Item>::const_iterator I = Mapping.find(Package);
+   map<string,Item>::iterator J = Mapping.find(Package + "/" + Architecture);
+
+   if (I == Mapping.end() && J == Mapping.end())
+   {
+      return 0;
+   }
+
+   Item *result = new Item;
+   if (I == Mapping.end()) *result = J->second;
+   else
+   {
+      *result = I->second;
+      if (J != Mapping.end())
+      {
+        Item *R = &J->second;
+        if (R->Priority != "") result->Priority = R->Priority;
+        if (R->OldMaint != "") result->OldMaint = R->OldMaint;
+        if (R->NewMaint != "") result->NewMaint = R->NewMaint;
+        for (map<string,string>::const_iterator foI = R->FieldOverride.begin();
+             foI != R->FieldOverride.end(); foI++)
+         {
+           result->FieldOverride[foI->first] = foI->second;
+        }
+      } 
+   } 
+   return result;
+};
+
+

 // Override::Item::SwapMaint - Swap the maintainer field if necessary  /*{{{*/
 // ---------------------------------------------------------------------
 /* Returns the new maintainer string after evaluating the rewriting rule. If
    there is a rule but it does not match then the empty string is returned,
    also if there was no rewrite rule the empty string is returned. Failed
    indicates if there was some kind of problem while rewriting. */
 // Override::Item::SwapMaint - Swap the maintainer field if necessary  /*{{{*/
 // ---------------------------------------------------------------------
 /* Returns the new maintainer string after evaluating the rewriting rule. If
    there is a rule but it does not match then the empty string is returned,
    also if there was no rewrite rule the empty string is returned. Failed
    indicates if there was some kind of problem while rewriting. */

-string Override::Item::SwapMaint(string Orig,bool &Failed)
+string Override::Item::SwapMaint(string const &Orig,bool &Failed)

 {
    Failed = false;
    
 {
    Failed = false;
    


@@ -153,10 +262,10 @@ string Override::Item::SwapMaint(string Orig,bool &Failed)
       override file. Thus it persists.*/
 #if 1
    // Break OldMaint up into little bits on double slash boundaries.
       override file. Thus it persists.*/
 #if 1
    // Break OldMaint up into little bits on double slash boundaries.

-   string::iterator End = OldMaint.begin();
+   string::const_iterator End = OldMaint.begin();

    while (1)
    {
    while (1)
    {

-      string::iterator Start = End;      
+      string::const_iterator Start = End;      

       for (; End < OldMaint.end() &&
           (End + 3 >= OldMaint.end() || End[0] != ' ' || 
            End[1] != '/' || End[2] != '/'); End++);
       for (; End < OldMaint.end() &&
           (End + 3 >= OldMaint.end() || End[0] != ' ' || 
            End[1] != '/' || End[2] != '/'); End++);