* merged with the current debian version

[apt.git] / apt-pkg / contrib / strutl.cc

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index a75fbdf9292e4720e4fab6878deaa699aa8a28c5..d96155917df06f6f4ded17e9c1195bc7427f0145 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -199,10 +199,10 @@ bool ParseCWord(const char *&String,string &Res)
 // QuoteString - Convert a string into quoted from                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // QuoteString - Convert a string into quoted from                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-string QuoteString(string Str,const char *Bad)
+string QuoteString(const string &Str, const char *Bad)

 {
    string Res;
 {
    string Res;

-   for (string::iterator I = Str.begin(); I != Str.end(); I++)
+   for (string::const_iterator I = Str.begin(); I != Str.end(); I++)

    {
       if (strchr(Bad,*I) != 0 || isprint(*I) == 0 || 
          *I <= 0x20 || *I >= 0x7F)
    {
       if (strchr(Bad,*I) != 0 || isprint(*I) == 0 || 
          *I <= 0x20 || *I >= 0x7F)


@@ -220,7 +220,7 @@ string QuoteString(string Str,const char *Bad)
 // DeQuoteString - Convert a string from quoted from                    /*{{{*/
 // ---------------------------------------------------------------------
 /* This undoes QuoteString */
 // DeQuoteString - Convert a string from quoted from                    /*{{{*/
 // ---------------------------------------------------------------------
 /* This undoes QuoteString */

-string DeQuoteString(string Str)
+string DeQuoteString(const string &Str)

 {
    string Res;
    for (string::const_iterator I = Str.begin(); I != Str.end(); I++)
 {
    string Res;
    for (string::const_iterator I = Str.begin(); I != Str.end(); I++)


@@ -317,7 +317,7 @@ string TimeToStr(unsigned long Sec)
 // SubstVar - Substitute a string for another string                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This replaces all occurances of Subst with Contents in Str. */
 // SubstVar - Substitute a string for another string                   /*{{{*/
 // ---------------------------------------------------------------------
 /* This replaces all occurances of Subst with Contents in Str. */

-string SubstVar(string Str,string Subst,string Contents)
+string SubstVar(const string &Str,const string &Subst,const string &Contents)

 {
    string::size_type Pos = 0;
    string::size_type OldPos = 0;
 {
    string::size_type Pos = 0;
    string::size_type OldPos = 0;


@@ -348,21 +348,18 @@ string SubstVar(string Str,const struct SubstVar *Vars)
 /* This converts a URI into a safe filename. It quotes all unsafe characters
    and converts / to _ and removes the scheme identifier. The resulting
    file name should be unique and never occur again for a different file */
 /* This converts a URI into a safe filename. It quotes all unsafe characters
    and converts / to _ and removes the scheme identifier. The resulting
    file name should be unique and never occur again for a different file */

-string URItoFileName(string URI)
+string URItoFileName(const string &URI)

 {
    // Nuke 'sensitive' items
    ::URI U(URI);
 {
    // Nuke 'sensitive' items
    ::URI U(URI);

-   U.User = string();
-   U.Password = string();
-   U.Access = "";
+   U.User.clear();
+   U.Password.clear();
+   U.Access.clear();

    
    // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
    
    // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";

-   URI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
-   string::iterator J = URI.begin();
-   for (; J != URI.end(); J++)
-      if (*J == '/') 
-        *J = '_';
-   return URI;
+   string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
+   replace(NewURI.begin(),NewURI.end(),'/','_');
+   return NewURI;

 }
                                                                        /*}}}*/
 // Base64Encode - Base64 Encoding routine for short strings            /*{{{*/
 }
                                                                        /*}}}*/
 // Base64Encode - Base64 Encoding routine for short strings            /*{{{*/


@@ -371,7 +368,7 @@ string URItoFileName(string URI)
    from wget and then patched and bug fixed.
  
    This spec can be found in rfc2045 */
    from wget and then patched and bug fixed.
  
    This spec can be found in rfc2045 */

-string Base64Encode(string S)
+string Base64Encode(const string &S)

 {
    // Conversion table.
    static char tbl[64] = {'A','B','C','D','E','F','G','H',
 {
    // Conversion table.
    static char tbl[64] = {'A','B','C','D','E','F','G','H',


@@ -540,17 +537,17 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd,
 // ---------------------------------------------------------------------
 /* The format is like those used in package files and the method 
    communication system */
 // ---------------------------------------------------------------------
 /* The format is like those used in package files and the method 
    communication system */

-string LookupTag(string Message,const char *Tag,const char *Default)
+string LookupTag(const string &Message,const char *Tag,const char *Default)

 {
    // Look for a matching tag.
    int Length = strlen(Tag);
 {
    // Look for a matching tag.
    int Length = strlen(Tag);

-   for (string::iterator I = Message.begin(); I + Length < Message.end(); I++)
+   for (string::const_iterator I = Message.begin(); I + Length < Message.end(); I++)

    {
       // Found the tag
       if (I[Length] == ':' && stringcasecmp(I,I+Length,Tag) == 0)
       {
         // Find the end of line and strip the leading/trailing spaces
    {
       // Found the tag
       if (I[Length] == ':' && stringcasecmp(I,I+Length,Tag) == 0)
       {
         // Find the end of line and strip the leading/trailing spaces

-        string::iterator J;
+        string::const_iterator J;

         I += Length + 1;
         for (; isspace(*I) != 0 && I < Message.end(); I++);
         for (J = I; *J != '\n' && J < Message.end(); J++);
         I += Length + 1;
         for (; isspace(*I) != 0 && I < Message.end(); I++);
         for (J = I; *J != '\n' && J < Message.end(); J++);


@@ -572,7 +569,7 @@ string LookupTag(string Message,const char *Tag,const char *Default)
 // ---------------------------------------------------------------------
 /* This inspects the string to see if it is true or if it is false and
    then returns the result. Several varients on true/false are checked. */
 // ---------------------------------------------------------------------
 /* This inspects the string to see if it is true or if it is false and
    then returns the result. Several varients on true/false are checked. */

-int StringToBool(string Text,int Default)
+int StringToBool(const string &Text,int Default)

 {
    char *End;
    int Res = strtol(Text.c_str(),&End,0);   
 {
    char *End;
    int Res = strtol(Text.c_str(),&End,0);   


@@ -738,7 +735,7 @@ static time_t timegm(struct tm *t)
    'timegm' to convert a struct tm in UTC to a time_t. For some bizzar
    reason the C library does not provide any such function :< This also
    handles the weird, but unambiguous FTP time format*/
    'timegm' to convert a struct tm in UTC to a time_t. For some bizzar
    reason the C library does not provide any such function :< This also
    handles the weird, but unambiguous FTP time format*/

-bool StrToTime(string Val,time_t &Result)
+bool StrToTime(const string &Val,time_t &Result)

 {
    struct tm Tm;
    char Month[10];
 {
    struct tm Tm;
    char Month[10];


@@ -825,7 +822,7 @@ static int HexDigit(int c)
 // Hex2Num - Convert a long hex number into a buffer                   /*{{{*/
 // ---------------------------------------------------------------------
 /* The length of the buffer must be exactly 1/2 the length of the string. */
 // Hex2Num - Convert a long hex number into a buffer                   /*{{{*/
 // ---------------------------------------------------------------------
 /* The length of the buffer must be exactly 1/2 the length of the string. */

-bool Hex2Num(string Str,unsigned char *Num,unsigned int Length)
+bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length)

 {
    if (Str.length() != Length*2)
       return false;
 {
    if (Str.length() != Length*2)
       return false;


@@ -986,7 +983,7 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...)
 // ---------------------------------------------------------------------
 /* The domain list is a comma seperate list of domains that are suffix
    matched against the argument */
 // ---------------------------------------------------------------------
 /* The domain list is a comma seperate list of domains that are suffix
    matched against the argument */

-bool CheckDomainList(string Host,string List)
+bool CheckDomainList(const string &Host,const string &List)

 {
    string::const_iterator Start = List.begin();
    for (string::const_iterator Cur = List.begin(); Cur <= List.end(); Cur++)
 {
    string::const_iterator Start = List.begin();
    for (string::const_iterator Cur = List.begin(); Cur <= List.end(); Cur++)


@@ -1009,7 +1006,7 @@ bool CheckDomainList(string Host,string List)
 // URI::CopyFrom - Copy from an object                                 /*{{{*/
 // ---------------------------------------------------------------------
 /* This parses the URI into all of its components */
 // URI::CopyFrom - Copy from an object                                 /*{{{*/
 // ---------------------------------------------------------------------
 /* This parses the URI into all of its components */

-void URI::CopyFrom(string U)
+void URI::CopyFrom(const string &U)

 {
    string::const_iterator I = U.begin();
 
 {
    string::const_iterator I = U.begin();
 


@@ -1038,9 +1035,9 @@ void URI::CopyFrom(string U)
       SingleSlash = U.end();
 
    // We can now write the access and path specifiers
       SingleSlash = U.end();
 
    // We can now write the access and path specifiers

-   Access = string(U,0,FirstColon - U.begin());
+   Access.assign(U.begin(),FirstColon);

    if (SingleSlash != U.end())
    if (SingleSlash != U.end())

-      Path = string(U,SingleSlash - U.begin());
+      Path.assign(SingleSlash,U.end());

    if (Path.empty() == true)
       Path = "/";
 
    if (Path.empty() == true)
       Path = "/";
 


@@ -1070,14 +1067,14 @@ void URI::CopyFrom(string U)
    if (At == SingleSlash)
    {
       if (FirstColon < SingleSlash)
    if (At == SingleSlash)
    {
       if (FirstColon < SingleSlash)

-        Host = string(U,FirstColon - U.begin(),SingleSlash - FirstColon);
+        Host.assign(FirstColon,SingleSlash);

    }
    else
    {
    }
    else
    {

-      Host = string(U,At - U.begin() + 1,SingleSlash - At - 1);
-      User = string(U,FirstColon - U.begin(),SecondColon - FirstColon);
+      Host.assign(At+1,SingleSlash);
+      User.assign(FirstColon,SecondColon);

       if (SecondColon < At)
       if (SecondColon < At)

-        Password = string(U,SecondColon - U.begin() + 1,At - SecondColon - 1);
+        Password.assign(SecondColon+1,At);

    }   
    
    // Now we parse the RFC 2732 [] hostnames.
    }   
    
    // Now we parse the RFC 2732 [] hostnames.


@@ -1105,7 +1102,7 @@ void URI::CopyFrom(string U)
    // Tsk, weird.
    if (InBracket == true)
    {
    // Tsk, weird.
    if (InBracket == true)
    {

-      Host = string();
+      Host.clear();

       return;
    }
    
       return;
    }
    


@@ -1116,7 +1113,7 @@ void URI::CopyFrom(string U)
       return;
    
    Port = atoi(string(Host,Pos+1).c_str());
       return;
    
    Port = atoi(string(Host,Pos+1).c_str());

-   Host = string(Host,0,Pos);
+   Host.assign(Host,0,Pos);

 }
                                                                        /*}}}*/
 // URI::operator string - Convert the URI to a string                  /*{{{*/
 }
                                                                        /*}}}*/
 // URI::operator string - Convert the URI to a string                  /*{{{*/


@@ -1171,12 +1168,12 @@ URI::operator string()
 // URI::SiteOnly - Return the schema and site for the URI              /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // URI::SiteOnly - Return the schema and site for the URI              /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-string URI::SiteOnly(string URI)
+string URI::SiteOnly(const string &URI)

 {
    ::URI U(URI);
 {
    ::URI U(URI);

-   U.User = string();
-   U.Password = string();
-   U.Path = string();
+   U.User.clear();
+   U.Password.clear();
+   U.Path.clear();

    U.Port = 0;
    return U;
 }
    U.Port = 0;
    return U;
 }