Author: alink
Date: Thu May 24 22:27:25 2007
New Revision: 17834
URL: http://svn.gna.org/viewcvs/wesnoth?rev=17834&view=rev
Log:
A first try to remove the "//". On linux it removes the majority of them
except the ones before _main.cfg (sadly probably the important ones). I'm on it
too.
It play a little with AMIGAOS, but normally keep the previous behavior (what's
":" in this OS?)
Modified:
trunk/src/filesystem.cpp
Modified: trunk/src/filesystem.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/filesystem.cpp?rev=17834&r1=17833&r2=17834&view=diff
==============================================================================
--- trunk/src/filesystem.cpp (original)
+++ trunk/src/filesystem.cpp Thu May 24 22:27:25 2007
@@ -450,16 +450,15 @@
/* generic Unix */
char *basename = entry->d_name;
#endif /* !APPLE */
-#ifndef __AMIGAOS4__
- const std::string fullname((directory + "/") + basename);
-#else
std::string fullname;
- if (directory.empty() || (directory[directory.size()-1]==':' ||
- directory[directory.size()-1] == '/'))
+ if (directory.empty() || directory[directory.size()-1] == '/'
+#ifdef __AMIGAOS4__
+ || (directory[directory.size()-1]==':')
+#endif /* __AMIGAOS4__ */
+ )
fullname = directory + basename;
else
fullname = (directory + "/") + basename;
-#endif /* __AMIGAOS4__ */
if (::stat(fullname.c_str(), &st) != -1) {
if (S_ISREG(st.st_mode)) {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
