change maxsplit default from "0" to maxint

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 96c6d2f3537e944841f5f72b6365ba5aaa26c377..77e48962c086ec7be659736b1fd6e9d62e303994 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1139,7 +1139,7 @@ vector<string> StringSplit(std::string const &s, std::string const &sep,
       split.push_back(s.substr(start, pos-start));
       
       // if maxsplit is reached, the remaining string is the last item
       split.push_back(s.substr(start, pos-start));
       
       // if maxsplit is reached, the remaining string is the last item

-      if(maxsplit > 0 && split.size() >= maxsplit)
+      if(split.size() >= maxsplit)

       {
          split[split.size()-1] = s.substr(start);
          break;
       {
          split[split.size()-1] = s.substr(start);
          break;

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index eb47287a42327269a646631f563154c32941a1b6..b42e0649171ceae71131f3236132af199a53d400 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -17,7 +17,7 @@
 #define STRUTL_H
 
 
 #define STRUTL_H
 
 

-
+#include <limits>

 #include <stdlib.h>
 #include <string>
 #include <cstring>
 #include <stdlib.h>
 #include <string>
 #include <cstring>


@@ -86,7 +86,7 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const
  */
 std::vector<std::string> StringSplit(std::string const &input, 
                                      std::string const &sep, 
  */
 std::vector<std::string> StringSplit(std::string const &input, 
                                      std::string const &sep, 

-                                     unsigned int maxsplit=0) __attrib_const;
+                                     unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) __attrib_const;

 
 void ioprintf(std::ostream &out,const char *format,...) __like_printf(2);
 void strprintf(std::string &out,const char *format,...) __like_printf(2);
 
 void ioprintf(std::ostream &out,const char *format,...) __like_printf(2);
 void strprintf(std::string &out,const char *format,...) __like_printf(2);

diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index b044b7f341469e2f12f4c5d914fb25e0283fa530..110a20d277dd49ecb7f747e704fa9433c2621e4b 100644 (file)
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -65,5 +65,9 @@ int main(int argc,char *argv[])
    equals(result[0], "x");
    equals(result[1], "y:z");
 
    equals(result[0], "x");
    equals(result[1], "y:z");
 

+   input = "abc";
+   result = StringSplit(input, "");
+   equals(result.size(), 0);
+

    return 0;
 }
    return 0;
 }