Merge remote-tracking branch 'origin/bugfix/dpkg-progress-multiarch' into bugfix/dpkg-progress-multiarch

3 files changed, 25 insertions, 8 deletions

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index fd768f183..77e48962c 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1120,11 +1120,9 @@ vector<string> VectorizeString(string const &haystack, char const &split)
 									/*}}}*/
 // StringSplit - split a string into a string vector by token		/*{{{*/
 // ---------------------------------------------------------------------
-/* This can be used to split a given string up from a given string token
- * into a vector of strings. A optional "maxsplit" argument can be used
- * to limit the splitting, in this case the 
+/* See header for details.
  */
-vector<string> StringSplit(string const &s, std::string const &sep,
+vector<string> StringSplit(std::string const &s, std::string const &sep,
                            unsigned int maxsplit)
 {
    vector<string> split;
@@ -1141,7 +1139,7 @@ vector<string> StringSplit(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
-      if(maxsplit > 0 && split.size() >= maxsplit)
+      if(split.size() >= maxsplit)
       {
          split[split.size()-1] = s.substr(start);
          break;
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 080f9f82e..b42e06491 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -17,7 +17,7 @@
 #define STRUTL_H
 
 
-
+#include <limits>
 #include <stdlib.h>
 #include <string>
 #include <cstring>
@@ -70,8 +70,23 @@ bool TokSplitString(char Tok,char *Input,char **List,
 // split a given string by a char
 std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const;
 
-// split a given string by a string token
-std::vector<std::string> StringSplit(std::string const &input, std::string const &sep, unsigned int maxsplit=0) __attrib_const;
+/* \brief Return a vector of strings from string "input" where "sep"
+ * is used as the delimiter string.
+ *
+ * \param input The input string.
+ *
+ * \param sep The seperator to use.
+ *
+ * \param maxsplit (optional) The maximum amount of splitting that
+ * should be done .
+ * 
+ * The optional "maxsplit" argument can be used to limit the splitting,
+ * if used the string is only split on maxsplit places and the last
+ * item in the vector contains the remainder string.
+ */
+std::vector<std::string> StringSplit(std::string const &input, 
+                                     std::string const &sep, 
+                                     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);
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index b044b7f34..110a20d27 100644
--- 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");
 
+   input = "abc";
+   result = StringSplit(input, "");
+   equals(result.size(), 0);
+
    return 0;
 }