[Wesnoth-cvs-commits] wesnoth ./changelog src/serialization/tokenizer...

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/09/11 14:55:44

Modified files:
        .              : changelog 
        src/serialization: tokenizer.hpp tokenizer.cpp parser.cpp 

Log message:
        attempt to fix 14494

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.923&tr2=1.924&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/tokenizer.hpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/tokenizer.cpp.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/parser.cpp.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.923 wesnoth/changelog:1.924
--- wesnoth/changelog:1.923     Sun Sep 11 09:05:12 2005
+++ wesnoth/changelog   Sun Sep 11 14:55:43 2005
@@ -8,6 +8,7 @@
      * Watch Towers can no longer be recalled in Clash of Armies
      * Saving Inarix no longer ends if the enemies are killed
  * fixed long filenames overflowing editor file chooser dialog (#13855)
+ * fixed filenames with spaces causing garbled errors 
 
 Version 0.9.7:
  * language and i18n:
Index: wesnoth/src/serialization/parser.cpp
diff -u wesnoth/src/serialization/parser.cpp:1.20 
wesnoth/src/serialization/parser.cpp:1.21
--- wesnoth/src/serialization/parser.cpp:1.20   Sat Jul  2 21:37:19 2005
+++ wesnoth/src/serialization/parser.cpp        Sun Sep 11 14:55:44 2005
@@ -1,4 +1,4 @@
-/* $Id: parser.cpp,v 1.20 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: parser.cpp,v 1.21 2005/09/11 14:55:44 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -280,7 +280,7 @@
 std::string parser::lineno_string(utils::string_map &i18n_symbols, std::string 
const &lineno,
                                  std::string const &error_string)
 {
-       std::vector< std::string > pos = utils::split(lineno, ' ');
+       std::vector< std::string > pos = utils::split(lineno, FILE_SEPARATOR);
        std::vector< std::string >::const_iterator i = pos.begin(), end = 
pos.end();
        std::string included_from = _(" included from ");
        std::string res;
Index: wesnoth/src/serialization/tokenizer.cpp
diff -u wesnoth/src/serialization/tokenizer.cpp:1.12 
wesnoth/src/serialization/tokenizer.cpp:1.13
--- wesnoth/src/serialization/tokenizer.cpp:1.12        Tue Jul 12 20:03:18 2005
+++ wesnoth/src/serialization/tokenizer.cpp     Sun Sep 11 14:55:44 2005
@@ -1,4 +1,4 @@
-/* $Id: tokenizer.cpp,v 1.12 2005/07/12 20:03:18 silene Exp $ */
+/* $Id: tokenizer.cpp,v 1.13 2005/09/11 14:55:44 ott Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -47,7 +47,7 @@
        else if (comment_line.size() > 3 && comment_line[0] == "line") {
                lineno_ = atoi(comment_line[1].c_str());
                comment_line.erase(comment_line.begin(), comment_line.begin() + 
2);
-               file_ = ' ' + utils::join(comment_line, ' ');
+               file_ = FILE_SEPARATOR + utils::join(comment_line, ' ');
        }
 }
 
Index: wesnoth/src/serialization/tokenizer.hpp
diff -u wesnoth/src/serialization/tokenizer.hpp:1.5 
wesnoth/src/serialization/tokenizer.hpp:1.6
--- wesnoth/src/serialization/tokenizer.hpp:1.5 Sat Jun  4 19:16:06 2005
+++ wesnoth/src/serialization/tokenizer.hpp     Sun Sep 11 14:55:44 2005
@@ -1,4 +1,4 @@
-/* $Id: tokenizer.hpp,v 1.5 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: tokenizer.hpp,v 1.6 2005/09/11 14:55:44 ott Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -16,6 +16,8 @@
 
 #include <istream>
 #include <string>
+
+#define FILE_SEPARATOR '\375'
 
 class config;