Attachment #321774 for bug #425606




	fs::directory_iterator directoryEnd; // default construction yields past-the-end
	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {
		if (is_directory(*iter)) {
			fs::create_directory(destPath.string() + "/" + iter->path().filename().string());
			DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());
			continue;
		}
		string destFile;
		if (iter->path().filename() == sideName + ".dat")
			destFile = theInput + ".dat";
		else	
			destFile = iter->path().filename().string();
		
		fs::copy_file(*iter, destPath.string() + "/" + destFile);
	}





void GameInit(char* argv[]) {
	namespace fs = boost::filesystem;
	//boost is really quite stupid
	#ifndef WIN32
		fs::path::default_name_check(fs::windows_name);
	#else
		fs::path::default_name_check(fs::native);
	#endif
	
	FindHomePath();
	LoadSettings(argv);





	fs::directory_iterator directoryEnd; // default construction yields past-the-end
	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {
		string filename = iter->path().filename().string();

		if (filename.find('.') == filename.npos)
			continue;

	fs::directory_iterator directoryEnd; // default construction yields past-the-end
	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {
		if (fs::is_directory(*iter)) {
			string fleetName = iter->path().filename().string();

			if (CheckFleetExists(fleetName)) {
				tempItem.desc = fleetName;

	fs::path iterPath(GetFleetDir(whichSide));
	fs::directory_iterator directoryEnd; // default construction yields past-the-end
	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {
		string filename = iter->path().filename().string();

		if (filename.find('.') == filename.npos)
			continue;

Lines 657-663 Link Here

(-)Stuff.cpp.orig (-1 / +1 lines)
657	fs::directory_iterator directoryEnd; // default construction yields past-the-end	657	fs::directory_iterator directoryEnd; // default construction yields past-the-end
658	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {	658	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {
659	if (fs::is_directory(iter) && !fs::is_empty(iter))	659	if (fs::is_directory(iter) && !fs::is_empty(iter))
660	RemoveDirectory(iter->string());	660	RemoveDirectory(iter->path().string());
661	else	661	else
662	fs::remove(*iter);	662	fs::remove(*iter);
663	}	663	}

Return to bug 425606

Lines 1596-1610 Link Here

(-)ForceSelectWin.cpp.orig (-4 / +4 lines)
1596	fs::directory_iterator directoryEnd; // default construction yields past-the-end	1596	fs::directory_iterator directoryEnd; // default construction yields past-the-end
1597	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {	1597	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {
1598	if (is_directory(*iter)) {	1598	if (is_directory(*iter)) {
1599	fs::create_directory(destPath.string() + "/" + iter->leaf());	1599	fs::create_directory(destPath.string() + "/" + iter->path().filename().string());
1600	DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf());	1600	DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());
1601	continue;	1601	continue;
1602	}	1602	}
1603	string destFile;	1603	string destFile;
1604	if (iter->leaf() == sideName + ".dat")	1604	if (iter->path().filename() == sideName + ".dat")
1605	destFile = theInput + ".dat";	1605	destFile = theInput + ".dat";
1606	else	1606	else
1607	destFile = iter->leaf();	1607	destFile = iter->path().filename().string();
1608		1608
1609	fs::copy_file(*iter, destPath.string() + "/" + destFile);	1609	fs::copy_file(*iter, destPath.string() + "/" + destFile);
1610	}	1610	}

Lines 339-350 Link Here

(-)Main.cpp.orig (-6 lines)
339		339
340	void GameInit(char* argv[]) {	340	void GameInit(char* argv[]) {
341	namespace fs = boost::filesystem;	341	namespace fs = boost::filesystem;
342	//boost is really quite stupid
343	#ifndef WIN32
344	fs::path::default_name_check(fs::windows_name);
345	#else
346	fs::path::default_name_check(fs::native);
347	#endif
348		342
349	FindHomePath();	343	FindHomePath();
350	LoadSettings(argv);	344	LoadSettings(argv);

Lines 206-212 Link Here

(-)Menu_Base.cpp.orig (-3 / +3 lines)
206		206
207	fs::directory_iterator directoryEnd; // default construction yields past-the-end	207	fs::directory_iterator directoryEnd; // default construction yields past-the-end
208	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {	208	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {
209	string filename = iter->leaf();	209	string filename = iter->path().filename().string();
210		210
211	if (filename.find('.') == filename.npos)	211	if (filename.find('.') == filename.npos)
212	continue;	212	continue;
Lines 237-243 Link Here
237	fs::directory_iterator directoryEnd; // default construction yields past-the-end	237	fs::directory_iterator directoryEnd; // default construction yields past-the-end
238	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {	238	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {
239	if (fs::is_directory(*iter)) {	239	if (fs::is_directory(*iter)) {
240	string fleetName = iter->leaf();	240	string fleetName = iter->path().filename().string();
241		241
242	if (CheckFleetExists(fleetName)) {	242	if (CheckFleetExists(fleetName)) {
243	tempItem.desc = fleetName;	243	tempItem.desc = fleetName;
Lines 261-267 Link Here
261	fs::path iterPath(GetFleetDir(whichSide));	261	fs::path iterPath(GetFleetDir(whichSide));
262	fs::directory_iterator directoryEnd; // default construction yields past-the-end	262	fs::directory_iterator directoryEnd; // default construction yields past-the-end
263	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {	263	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {
264	string filename = iter->leaf();	264	string filename = iter->path().filename().string();
265		265
266	if (filename.find('.') == filename.npos)	266	if (filename.find('.') == filename.npos)
267	continue;	267	continue;