Author: sapient
Date: Sat Jul 5 03:24:48 2008
New Revision: 27741
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27741&view=rev
Log:
minor cleanup of needs_escaping()
Modified:
trunk/src/addon_management.cpp
Modified: trunk/src/addon_management.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon_management.cpp?rev=27741&r1=27740&r2=27741&view=diff
==============================================================================
--- trunk/src/addon_management.cpp (original)
+++ trunk/src/addon_management.cpp Sat Jul 5 03:24:48 2008
@@ -36,7 +36,7 @@
{
const std::string parentd = get_addon_campaigns_dir();
- // Cope with old-style or new-style file organization
+ // Cope with old-style or new-style file organization
std::string exterior = parentd + "/" + addon_name + ".pbl";
std::string interior = parentd + "/" + addon_name + "/_server.pbl";
const std::string pbl_file = (file_exists(exterior)? exterior :
interior);
@@ -102,14 +102,24 @@
}
namespace {
- const char escape_char = 1;
-}
-
-static bool needs_escaping(char c) { return c == 0 || c == escape_char || c ==
13 || c == static_cast<char>(254); }
+ const char escape_char = '\x01';
+}
+
+static bool needs_escaping(char c) {
+ switch(c) {
+ case '\x00':
+ case escape_char:
+ case '\x0D': //Windows -- carriage return
+ case '\xFE': //Parser code -- textdomain or linenumber&filename
+ return true;
+ default:
+ return false;
+ }
+}
static bool IsCR(const char& c)
{
- return c == 13;
+ return c == '\x0D';
}
static std::string strip_cr(std::string str, bool strip)
@@ -175,7 +185,7 @@
patterns.first.push_back("*-bak");
patterns.first.push_back("*.pbl");
patterns.first.push_back("*.ign");
- /*
+ /*
* Prevent certain potential security compromises.
* The idea is to stop bad guys from uploading things
* that could become trojans if an unsuspecting user
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
