do not strip epochs from state version strings

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

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 392412e52e2d8ca776b4d5c7fc0e35116bf5b69a..d388cbda3a4dd6f7f62f7ec13f9db391a82f075d 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -464,7 +464,9 @@ string SubstVar(const string &Str,const string &Subst,const string &Contents)
 
    if (OldPos >= Str.length())
       return Temp;
 
    if (OldPos >= Str.length())
       return Temp;

-   return Temp + string(Str,OldPos);
+
+   Temp.append(Str, OldPos, string::npos);
+   return Temp;

 }
 string SubstVar(string Str,const struct SubstVar *Vars)
 {
 }
 string SubstVar(string Str,const struct SubstVar *Vars)
 {


@@ -690,9 +692,9 @@ string LookupTag(const string &Message,const char *Tag,const char *Default)
         // Find the end of line and strip the leading/trailing spaces
         string::const_iterator J;
         I += Length + 1;
         // Find the end of line and strip the leading/trailing spaces
         string::const_iterator J;
         I += Length + 1;

-        for (; isspace(*I) != 0 && I < Message.end(); ++I);
+        for (; isspace_ascii(*I) != 0 && I < Message.end(); ++I);

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

-        for (; J > I && isspace(J[-1]) != 0; --J);
+        for (; J > I && isspace_ascii(J[-1]) != 0; --J);

         
         return string(I,J);
       }
         
         return string(I,J);
       }


@@ -788,7 +790,11 @@ bool ReadMessages(int Fd, vector<string> &List)
         return false;
 
       // No data
         return false;
 
       // No data

+#if EAGAIN != EWOULDBLOCK

       if (Res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))
       if (Res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))

+#else
+      if (Res < 0 && errno == EAGAIN)
+#endif

         return true;
       if (Res < 0)
         return false;
         return true;
       if (Res < 0)
         return false;


@@ -1106,26 +1112,36 @@ static int HexDigit(int c)
       return c - 'a' + 10;
    if (c >= 'A' && c <= 'F')
       return c - 'A' + 10;
       return c - 'a' + 10;
    if (c >= 'A' && c <= 'F')
       return c - 'A' + 10;

-   return 0;
+   return -1;

 }
                                                                        /*}}}*/
 // 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(const string &Str,unsigned char *Num,unsigned int Length)
 }
                                                                        /*}}}*/
 // 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(const string &Str,unsigned char *Num,unsigned int Length)

+{
+   return Hex2Num(APT::StringView(Str), Num, Length);
+}
+
+bool Hex2Num(const APT::StringView Str,unsigned char *Num,unsigned int Length)

 {
    if (Str.length() != Length*2)
       return false;
    
    // Convert each digit. We store it in the same order as the string
    int J = 0;
 {
    if (Str.length() != Length*2)
       return false;
    
    // Convert each digit. We store it in the same order as the string
    int J = 0;

-   for (string::const_iterator I = Str.begin(); I != Str.end();J++, I += 2)
+   for (auto I = Str.begin(); I != Str.end();J++, I += 2)

    {
    {

-      if (isxdigit(*I) == 0 || isxdigit(I[1]) == 0)
+      int first_half = HexDigit(I[0]);
+      int second_half;
+      if (first_half < 0)

         return false;
       
         return false;
       

-      Num[J] = HexDigit(I[0]) << 4;
-      Num[J] += HexDigit(I[1]);
+      second_half = HexDigit(I[1]);
+      if (second_half < 0)
+        return false;
+      Num[J] = first_half << 4;
+      Num[J] += second_half;

    }
    
    return true;
    }
    
    return true;


@@ -1201,7 +1217,7 @@ vector<string> StringSplit(std::string const &s, std::string const &sep,
    vector<string> split;
    size_t start, pos;
 
    vector<string> split;
    size_t start, pos;
 

-   // no seperator given, this is bogus
+   // no separator given, this is bogus

    if(sep.size() == 0)
       return split;
 
    if(sep.size() == 0)
       return split;
 


@@ -1364,17 +1380,18 @@ string StripEpoch(const string &VerStr)
    return VerStr.substr(i+1);
 }
                                                                        /*}}}*/
    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
    therefore to do the absolut minimum - and is notable faster than
    standard tolower/toupper and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */
 // tolower_ascii - tolower() function that ignores the locale          /*{{{*/
 // ---------------------------------------------------------------------
 /* This little function is the most called method we have and tries
    therefore to do the absolut minimum - and is notable faster than
    standard tolower/toupper and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */

+#undef tolower_ascii
+int tolower_ascii(int const c) APT_CONST APT_COLD;

 int tolower_ascii(int const c)
 {
 int tolower_ascii(int const c)
 {

-   if (c >= 'A' && c <= 'Z')
-      return c + 32;
-   return c;
+   return tolower_ascii_inline(c);

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 


@@ -1384,14 +1401,11 @@ int tolower_ascii(int const c)
    therefore to do the absolut minimum - and is notable faster than
    standard isspace() and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */
    therefore to do the absolut minimum - and is notable faster than
    standard isspace() and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */

+#undef isspace_ascii
+int isspace_ascii(int const c) APT_CONST APT_COLD;

 int isspace_ascii(int const c)
 {
 int isspace_ascii(int const c)
 {

-   return (c == ' '
-           || c == '\f'
-           || c == '\n'
-           || c == '\r'
-           || c == '\t'
-           || c == '\v');
+   return isspace_ascii_inline(c);

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/