fdsdump: common: fix and improve string_split function

The function now correctly determines delimiter size when splitting, and
supports the use of the max_pieces parameter.

Author: sedmicha

src/tools/fdsdump/src/common/common.cpp

@@ -6,19 +6,27 @@
 namespace fdsdump {
 
 std::vector<std::string>
-string_split(const std::string &str, const std::string &delimiter)
+string_split(
+    const std::string &str,
+    const std::string &delimiter,
+    unsigned int max_pieces)
 {
     std::vector<std::string> pieces;
     std::size_t pos = 0;
 
     for (;;) {
+        if (max_pieces > 0 && pieces.size() == max_pieces - 1) {
+            pieces.emplace_back(str.begin() + pos, str.end());
+            break;
+        }
+
         std::size_t next_pos = str.find(delimiter, pos);
         if (next_pos == std::string::npos) {
             pieces.emplace_back(str.begin() + pos, str.end());
             break;
         }
         pieces.emplace_back(str.begin() + pos, str.begin() + next_pos);
-        pos = next_pos + 1;
+        pos = next_pos + delimiter.size();
     }
     return pieces;
 }

src/tools/fdsdump/src/common/common.hpp

@@ -27,10 +27,14 @@ using shared_tsnapshot = std::shared_ptr<fds_tsnapshot_t>;
  * If no delimeter is found, the result contains only the original string.
  * @param str String to be splitted
  * @param delimiter String delimeter
+ * @param max_pieces The maximum number of pieces (0 = no limit)
  * @return Vector of piecies.
  */
 std::vector<std::string>
-string_split(const std::string &str, const std::string &delimiter);
+string_split(
+    const std::string &str,
+    const std::string &delimiter,
+    unsigned int max_pieces = 0);
 
 /**
  * @brief Split string by a delimiter from right.