X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fpath.cpp;h=1a9460ac9c15f4496fd320adacf89d9aed36401a;hp=ff6713f1f5c7625e66104c812eb4bc999c1e66bb;hb=4cc2d6ced17e8cbe1ae3251069131d22a292b857;hpb=66bdaa1f9f833e18a07d061208ce6080f3abac06

diff --git a/source/path.cpp b/source/path.cpp
index ff6713f..1a9460a 100644
--- a/source/path.cpp
+++ b/source/path.cpp
@@ -5,18 +5,13 @@ Distributed under the LGPL
 */
 #include <msp/strutils.h>
 #include "path.h"
+#include "utils.h"
 
 using namespace std;
-#include <iostream>
 
 namespace Msp {
 namespace Path {
 
-bool is_windows_drive(const std::string &p)
-{
-	return (p.size()==2 && ((p[0]>='A' && p[0]<='Z') || (p[0]>='a' && p[0]<='z')) && p[1]==':');
-}
-
 /**
 Returns the number of components in the path.
 */
@@ -146,10 +141,12 @@ Path::iterator::iterator(const Path &p):
 	path(p),
 	start(0)
 {
-	if(path.path[0]==DIRCHAR)
+	if(path.path.empty())
+		start=end=string::npos;
+	else if(path.path[0]==DIRCHAR)
 		end=1;
 #ifdef WIN32
-	else if(path.path[2]==DIRCHAR && is_windows_drive(path.path.substr(0,2)))
+	else if(path.path.size()>2 && path.path[2]==DIRCHAR && is_windows_drive(path.path.substr(0,2)))
 		end=2;
 #endif
 	else