X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fstrsplit.cc;h=85f0c5c310552d9d7ef30e0e81403c31dd5dcd48;hb=5b40e073e9c973479c3d286a007c57e1e0fa3d0f;hp=7f29a778870ac8b4d9fa3b90e8cf643db5bbe205;hpb=22c20ab6f215c0ab24702a479aa6821c25a7d058;p=ardour.git

diff --git a/libs/pbd/strsplit.cc b/libs/pbd/strsplit.cc
index 7f29a77887..85f0c5c310 100644
--- a/libs/pbd/strsplit.cc
+++ b/libs/pbd/strsplit.cc
@@ -1,10 +1,30 @@
-#include <pbd/strsplit.h>
+/*
+    Copyright (C) 2000-2007 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "pbd/strsplit.h"
 
 using namespace std;
+using namespace Glib;
 
 void
 split (string str, vector<string>& result, char splitchar)
-{	
+{
 	string::size_type pos;
 	string remaining;
 	string::size_type len = str.length();
@@ -29,7 +49,47 @@ split (string str, vector<string>& result, char splitchar)
 
 	remaining = str;
 
-	while ((pos = remaining.find_first_of (':')) != string::npos) {
+	while ((pos = remaining.find_first_of (splitchar)) != string::npos) {
+		if (pos != 0) {
+			result.push_back (remaining.substr (0, pos));
+		}
+		remaining = remaining.substr (pos+1);
+	}
+
+	if (remaining.length()) {
+
+		result.push_back (remaining);
+	}
+}
+
+void
+split (ustring str, vector<ustring>& result, char splitchar)
+{
+	ustring::size_type pos;
+	ustring remaining;
+	ustring::size_type len = str.length();
+	int cnt;
+
+	cnt = 0;
+
+	if (str.empty()) {
+		return;
+	}
+
+	for (ustring::size_type n = 0; n < len; ++n) {
+		if (str[n] == gunichar(splitchar)) {
+			cnt++;
+		}
+	}
+
+	if (cnt == 0) {
+		result.push_back (str);
+		return;
+	}
+
+	remaining = str;
+
+	while ((pos = remaining.find_first_of (splitchar)) != ustring::npos) {
 		result.push_back (remaining.substr (0, pos));
 		remaining = remaining.substr (pos+1);
 	}