[Dcplusplus-commit] SF.net SVN: dcplusplus: [652] dcplusplus/trunk

[<arn...@us...>]

Revision: 652
          http://svn.sourceforge.net/dcplusplus/?rev=652&view=rev
Author:   arnetheduck
Date:     2006-09-19 06:00:44 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
patch

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/client/ShareManager.cpp
    dcplusplus/trunk/windows/AboutDlg.h

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2006-09-19 09:42:13 UTC (rev 651)
+++ dcplusplus/trunk/changelog.txt	2006-09-19 13:00:44 UTC (rev 652)
@@ -12,6 +12,7 @@
 * Upgraded yaSSL to 1.4.0
 * Fixed some SSL connection issues
 * Fixed on-the-fly compression of file lists
+* [bug 1055] Stopped files.xml.bz2 from being deleted on linux (thanks dorian)
 
 -- 0.695 2006-09-10 --
 * PM popup/ignore options updated, in nmdc a hub is any nick which hasn't sent a hello or myinfo, and a bot is a nick with myinfo

Modified: dcplusplus/trunk/client/ShareManager.cpp
===================================================================
--- dcplusplus/trunk/client/ShareManager.cpp	2006-09-19 09:42:13 UTC (rev 651)
+++ dcplusplus/trunk/client/ShareManager.cpp	2006-09-19 13:00:44 UTC (rev 652)
@@ -70,7 +70,7 @@
 	WIN32_FIND_DATA data;
 	HANDLE hFind;
 
-	hFind = FindFirstFile(Text::toT(Util::getConfigPath() + "files*.xml.bz2").c_str(), &data);
+	hFind = FindFirstFile(Text::toT(Util::getConfigPath() + "files?*.xml.bz2").c_str(), &data);
 	if(hFind != INVALID_HANDLE_VALUE) {
 		do {
 			if(_tcslen(data.cFileName) > 13) // length of "files.xml.bz2"
@@ -84,7 +84,7 @@
 	DIR* dir = opendir(Util::getConfigPath().c_str());
 	if (dir) {
 		while (struct dirent* ent = readdir(dir)) {
-			if (fnmatch("files*.xml.bz2", ent->d_name, 0) == 0) {
+			if (fnmatch("files?*.xml.bz2", ent->d_name, 0) == 0) {
 					File::deleteFile(Util::getConfigPath() + ent->d_name);
 				}
 		}

Modified: dcplusplus/trunk/windows/AboutDlg.h
===================================================================
--- dcplusplus/trunk/windows/AboutDlg.h	2006-09-19 09:42:13 UTC (rev 651)
+++ dcplusplus/trunk/windows/AboutDlg.h	2006-09-19 13:00:44 UTC (rev 652)
@@ -42,7 +42,7 @@
 _T("defr, ullner, fleetcommand, liny, xan, olle svensson, mark gillespie, jeremy huddleston, ")
 _T("bsod, sulan, jonathan stone, tim burton, izzzo, guitarm, paka, nils maier, jens oknelid, yoji, ")
 _T("krzysztof tyszecki, poison, pothead, pur, bigmuscle, martin, jove, bart vullings, ")
-_T("steven sheehy, tobias nygren, poy. ")
+_T("steven sheehy, tobias nygren, poy, dorian. ")
 _T("Keep it coming!");
 
 class AboutDlg : public CDialogImpl<AboutDlg>, private HttpConnectionListener


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.