WebSVN – spk – Diff – /libspk/src/DirIO.cpp

+}
 Utils::CStringList CDirIO::dirList(Utils::String dir, Utils::String filePattern) const
+{
 	Utils::CStringList files;
+	dirList(files, dir, filePattern);
+	return files;
+}
+bool CDirIO::dirList(Utils::CStringList &files, Utils::String dir, Utils::String filePattern) const
+{
 	dir = parseDir(dir);
 	if ( dir.empty() )
-		return files;
+		return false;
 	dir = dir.findReplace("\\", "/");
 	if (filePattern.empty())
 		dir += "/*";
 	else
+	{
 		dir += "/";
 		dir += filePattern;
+	}
 	dir = dir.findReplace("//", "/");
 #ifdef _WIN32
 	dir = dir.findReplace("/", "\\");
 	WIN32_FIND_DATA data;
 	TCHAR buf[5000];
 	wsprintf(buf, L"%hs", dir.c_str());
 	HANDLE h = FindFirstFile(buf, &data);
 	if ( h != INVALID_HANDLE_VALUE)
+	{
 		std::wstring ws(data.cFileName);
 		std::string s(ws.begin(), ws.end());
 			if ( checkFile != "." && checkFile != ".." )
 				files.pushBack(checkFile);
+		}
 		FindClose(h);
+		return true;
+	}
+	return false;
 #else
 	DIR *dir;
 	struct dirent *ent;
 	if ((dir = opendir(dir.c_str())) != NULL) {
 		while ((ent = readdir(dir)) != NULL) {
 			if (checkFile != "." && checkFile != "..")
 				files.pushBack(checkFile);
+		}
 		closedir(dir);
+	}
+	return true;
 #endif//_WIN32
-	return files;
+}
 CyStringList *CDirIO::DirList(CyString dir, CyString filepattern)
+{
 	dir = ParseDir(dir);

Subversion Repositories spk