implement StringSplit() as we need this to fix the dpkg status-fd output parsing

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 0955b69f79a67f538e1af0f59359f543cc3f5bb5..819d50de0c8d03177c8cda39c36312a22576f774 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1118,6 +1118,28 @@ vector<string> VectorizeString(string const &haystack, char const &split)
    return exploded;
 }
                                                                        /*}}}*/
    return exploded;
 }
                                                                        /*}}}*/

+// StringSplit - like python string.split              /*{{{*/
+// ---------------------------------------------------------------------
+/* This can be used to split a given string up into a vector of strings
+ * The seperator is a string
+ */
+vector<string> StringSplit(string const &s, std::string const &sep)
+{
+   vector<string> split;
+   size_t start, pos;
+   start = pos = 0;
+   if(sep.size() == 0)
+      return split;
+   
+   do {
+      pos = s.find(sep, start);
+      split.push_back(s.substr(start, pos-start));
+      if(pos != string::npos)
+         start = pos+sep.size();
+   } while (pos != string::npos);
+   return split;
+}
+                                                                       /*}}}*/

 // RegexChoice - Simple regex list/list matcher                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RegexChoice - Simple regex list/list matcher                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 5308961411950ba36df47474b3705c6b3158f79b..c97246c909bfa152b23b359d5a79e723e14661ca 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -65,6 +65,8 @@ bool Hex2Num(const std::string &Str,unsigned char *Num,unsigned int Length);
 bool TokSplitString(char Tok,char *Input,char **List,
                    unsigned long ListMax);
 std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const;
 bool TokSplitString(char Tok,char *Input,char **List,
                    unsigned long ListMax);
 std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const;

+// like python string.split
+std::vector<std::string> StringSplit(std::string const &haystack, std::string const &sep) __attrib_const;

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

diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index bfe0d722254b1b12129d9c6720691ef2587a899c..bac9dd2f13a14890891d5c499ac31f26a4217392 100644 (file)
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -42,5 +42,22 @@ int main(int argc,char *argv[])
    output = DeEscapeString(input);
    equals(output, expected);
 
    output = DeEscapeString(input);
    equals(output, expected);
 

+   // Split
+   input = "status: libnet1:amd64: unpacked";
+   vector<std::string> result = StringSplit(input, ": ");
+   equals(result[0], "status");
+   equals(result[1], "libnet1:amd64");
+   equals(result[2], "unpacked");
+   equals(result.size(), 3);
+
+   input = "status: libnet1:amd64: unpacked";
+   result = StringSplit(input, "xxx");
+   equals(result[0], input);
+   equals(result.size(), 1);
+
+   input = "status: libnet1:amd64: unpacked";
+   result = StringSplit(input, "");
+   equals(result.size(), 0);
+

    return 0;
 }
    return 0;
 }