2009-10-17 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed the bug that Netrc::parse() cannot recognize comment line.
	* src/Netrc.cc
	* src/Util.h
	* test/NetrcTest.cc
	* test/sample.netrc

1 files changed, 31 insertions, 0 deletions

diff --git a/src/Util.h b/src/Util.h
index ff0e1827..4508f14c 100644
--- a/src/Util.h
+++ b/src/Util.h
@@ -140,6 +140,37 @@ public:
   static void slice(std::deque<std::string>& result, const std::string& src,
 		    char delim, bool trim = false);
   
+  template<typename OutputIterator>
+  static OutputIterator split(const std::string& src, OutputIterator out,
+			      const std::string& delims, bool doTrim = false)
+  {
+    std::string::size_type p = 0;
+    while(1) {
+      std::string::size_type np = src.find_first_of(delims, p);
+      if(np == std::string::npos) {
+	std::string term = src.substr(p);
+	if(doTrim) {
+	  term = trim(term);
+	}
+	if(!term.empty()) {
+	  *out = term;
+	  ++out;
+	}
+	break;
+      }
+      std::string term = src.substr(p, np-p);
+      if(doTrim) {
+	term = trim(term);
+      }
+      p = np+1;
+      if(!term.empty()) {
+	*out = term;
+	++out;
+      }
+    }
+    return out;
+  }
+
   static const std::string DEFAULT_TRIM_CHARSET;
 
   static std::string trim(const std::string& src,