Damn strlen() crashes when NULL is passed. Fixed.

[supertux.git] / src / lispreader.cpp

diff --git a/src/lispreader.cpp b/src/lispreader.cpp
index 83b4fbf..e9a150d 100644 (file)
--- a/src/lispreader.cpp
+++ b/src/lispreader.cpp
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <iostream>
-#include <queue>
+#include <vector>
 #include <string>
 #include <cctype>
 #include <cstdlib>
@@ -44,7 +44,7 @@
 #define TOKEN_FALSE                   10
 
 
-#define MAX_TOKEN_LENGTH           1024
+#define MAX_TOKEN_LENGTH           4096
 
 static char token_string[MAX_TOKEN_LENGTH + 1] = "";
 static int token_length = 0;
@@ -509,12 +509,12 @@ lisp_free (lisp_object_t *obj)
   /** We have to use this iterative code, because the recursive function
    * produces a stack overflow and crashs on OSX 10.2
    */
-  std::queue<lisp_object_t*> objs;
-  objs.push(obj);
+  std::vector<lisp_object_t*> objs;
+  objs.push_back(obj);
 
   while(!objs.empty()) {
-    lisp_object_t* obj = objs.front();
-    objs.pop();
+    lisp_object_t* obj = objs.back();
+    objs.pop_back();
         
     switch (obj->type) {
       case LISP_TYPE_INTERNAL :
@@ -530,14 +530,14 @@ lisp_free (lisp_object_t *obj)
       case LISP_TYPE_CONS :
       case LISP_TYPE_PATTERN_CONS :
         if(obj->v.cons.car)
-          objs.push(obj->v.cons.car);
+          objs.push_back(obj->v.cons.car);
         if(obj->v.cons.cdr)
-          objs.push(obj->v.cons.cdr);
+          objs.push_back(obj->v.cons.cdr);
         break;
 
       case LISP_TYPE_PATTERN_VAR :
         if(obj->v.pattern.sub)
-          objs.push(obj->v.pattern.sub);
+          objs.push_back(obj->v.pattern.sub);
         break;
     }
 
@@ -1206,9 +1206,46 @@ LispReader::read_char_vector (const char* name, std::vector<char>& vec)
 }
 
 bool
-LispReader::read_string (const char* name, std::string& str)
+LispReader::read_string (const char* name, std::string& str, bool translatable)
 {
-  lisp_object_t* obj = search_for (name);
+  lisp_object_t* obj;
+  if(translatable)
+    {
+  /* Internationalization support: check for the suffix: str + "-" + $LANG variable.
+     If not found, use the regular string.
+     So, translating a string in a Lisp file would result in something like:
+     (text "Hello World!")
+     (text-fr "Bonjour Monde!")
+     being fr the value of LANG (echo $LANG) for the language we want to translate to */
+
+    char* lang = getenv("tt");
+
+    char str_[1024];  // check, for instance, for (title-fr_FR "Bonjour")
+    sprintf(str_, "%s-%s", name, lang);
+
+    obj = search_for (str_);
+
+    if(!obj)  // check, for instance, for (title-fr "Bonjour")
+      {
+      if(lang != NULL && strlen(lang) >= 2)
+        {
+        char lang_[3];
+        strncpy(lang_, lang, 2);
+        lang_[2] = '\0';
+        sprintf(str_, "%s-%s", name, lang_);
+
+        obj = search_for (str_);
+        }
+      else
+        obj = 0;
+      }
+
+    if(!obj)  // check, for instance, for (title "Hello")
+      obj = search_for (name);
+    }
+  else
+    obj = search_for (name);
+
   if (!obj)
     return false;