Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index df11a80ad12f124397cb3c61cdfaea74aa32fbf2..d06637155b48e7ea8977f1e7cbc5006ed01351af 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -117,7 +117,13 @@ char *_strstrip(char *String)
 
    if (*String == 0)
       return String;
 
    if (*String == 0)
       return String;

-
+   return _strrstrip(String);
+}
+                                                                       /*}}}*/
+// strrstrip - Remove white space from the back of a string    /*{{{*/
+// ---------------------------------------------------------------------
+char *_strrstrip(char *String)
+{

    char *End = String + strlen(String) - 1;
    for (;End != String - 1 && (*End == ' ' || *End == '\t' || *End == '\n' ||
                               *End == '\r'); End--);
    char *End = String + strlen(String) - 1;
    for (;End != String - 1 && (*End == ' ' || *End == '\t' || *End == '\n' ||
                               *End == '\r'); End--);


@@ -753,7 +759,7 @@ bool ReadMessages(int Fd, vector<string> &List)
       for (char *I = Buffer; I + 1 < End; I++)
       {
         if (I[1] != '\n' ||
       for (char *I = Buffer; I + 1 < End; I++)
       {
         if (I[1] != '\n' ||

-            (strncmp(I, "\n\n", 2) != 0 && strncmp(I, "\r\n\r\n", 4) != 0))
+              (I[0] != '\n' && strncmp(I, "\r\n\r\n", 4) != 0))

            continue;
         
         // Pull the message out
            continue;
         
         // Pull the message out


@@ -761,7 +767,7 @@ bool ReadMessages(int Fd, vector<string> &List)
         PartialMessage += Message;
 
         // Fix up the buffer
         PartialMessage += Message;
 
         // Fix up the buffer

-        for (; I < End && (*I == '\r' || *I == '\n'); ++I);
+        for (; I < End && (*I == '\n' || *I == '\r'); ++I);

         End -= I-Buffer;        
         memmove(Buffer,I,End-Buffer);
         I = Buffer;
         End -= I-Buffer;        
         memmove(Buffer,I,End-Buffer);
         I = Buffer;


@@ -1227,12 +1233,12 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...)
    va_list args;
    int Did;
 
    va_list args;
    int Did;
 

-   va_start(args,Format);
-

    if (End <= Buffer)
       return End;
    if (End <= Buffer)
       return End;

-
+   va_start(args,Format);

    Did = vsnprintf(Buffer,End - Buffer,Format,args);
    Did = vsnprintf(Buffer,End - Buffer,Format,args);

+   va_end(args);
+

    if (Did < 0 || Buffer + Did > End)
       return End;
    return Buffer + Did;
    if (Did < 0 || Buffer + Did > End)
       return End;
    return Buffer + Did;


@@ -1247,7 +1253,7 @@ string StripEpoch(const string &VerStr)
       return VerStr;
    return VerStr.substr(i+1);
 }
       return VerStr;
    return VerStr.substr(i+1);
 }

-
+                                                                       /*}}}*/

 // tolower_ascii - tolower() function that ignores the locale          /*{{{*/
 // ---------------------------------------------------------------------
 /* This little function is the most called method we have and tries
 // tolower_ascii - tolower() function that ignores the locale          /*{{{*/
 // ---------------------------------------------------------------------
 /* This little function is the most called method we have and tries


@@ -1285,14 +1291,26 @@ bool CheckDomainList(const string &Host,const string &List)
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-// DeEscapeString - unescape (\0XX and \xXX) from a string             /*{{{*/
+// strv_length - Return the length of a NULL-terminated string array   /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+size_t strv_length(const char **str_array)
+{
+   size_t i;
+   for (i=0; str_array[i] != NULL; i++)
+      /* nothing */
+      ;
+   return i;
+}
+
+// DeEscapeString - unescape (\0XX and \xXX) from a string             /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 string DeEscapeString(const string &input)
 {
    char tmp[3];
 // ---------------------------------------------------------------------
 /* */
 string DeEscapeString(const string &input)
 {
    char tmp[3];

-   string::const_iterator it, escape_start;
-   string output, octal, hex;
+   string::const_iterator it;
+   string output;

    for (it = input.begin(); it != input.end(); ++it)
    {
       // just copy non-escape chars
    for (it = input.begin(); it != input.end(); ++it)
    {
       // just copy non-escape chars


@@ -1478,9 +1496,12 @@ URI::operator string()
           
       if (User.empty() == false)
       {
           
       if (User.empty() == false)
       {

-        Res +=  User;
+        // FIXME: Technically userinfo is permitted even less
+        // characters than these, but this is not conveniently
+        // expressed with a blacklist.
+        Res += QuoteString(User, ":/?#[]@");

         if (Password.empty() == false)
         if (Password.empty() == false)

-           Res += ":" + Password;
+           Res += ":" + QuoteString(Password, ":/?#[]@");

         Res += "@";
       }
       
         Res += "@";
       }
       


@@ -1519,7 +1540,6 @@ string URI::SiteOnly(const string &URI)
    U.User.clear();
    U.Password.clear();
    U.Path.clear();
    U.User.clear();
    U.Password.clear();
    U.Path.clear();

-   U.Port = 0;

    return U;
 }
                                                                        /*}}}*/
    return U;
 }
                                                                        /*}}}*/


@@ -1531,7 +1551,6 @@ string URI::NoUserPassword(const string &URI)
    ::URI U(URI);
    U.User.clear();
    U.Password.clear();
    ::URI U(URI);
    U.User.clear();
    U.Password.clear();

-   U.Port = 0;

    return U;
 }
                                                                        /*}}}*/
    return U;
 }
                                                                        /*}}}*/