Merge branch 'development'

[NeonServV5.git] / src / lang.c

diff --git a/src/lang.c b/src/lang.c
index aa2518ae6f51aa54383b6844fb208771eba282a5..7d1532bf424bd7003cca2560c4da19ef26e1f0c2 100644 (file)
--- a/src/lang.c
+++ b/src/lang.c
@@ -1,5 +1,5 @@
-/* lang.c - NeonServ v5.0
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* lang.c - NeonServ v5.6
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 #include "UserNode.h"
 #include "DBHelper.h"
 #include "mysqlConn.h"
+#include "tools.h"
+#include "log.h"
 
 #define DEFAULT_LANG_TAG "EN"
 #define DEFAULT_LANG_NAME "English"
@@ -53,7 +55,7 @@ static struct language* add_language(char *langtag, char *langname) {
     if(cindex == MAXLANGUAGES) return NULL;
     struct language *lang = malloc(sizeof(*lang));
     if (!lang) {
-        perror("malloc() failed");
+        printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         return NULL;
     }
     lang->langtag = strdup(langtag);
@@ -135,13 +137,21 @@ void register_default_language_table(const struct default_language_entry *msgtab
 
 void register_language_string(struct language *lang, char *ident, char *text) {
     int cindex = get_entry_index(ident);
-    struct language_table *lang_entry = malloc(sizeof(*lang_entry));
-    if (!lang_entry) {
-        perror("malloc() failed");
-        return;
+    struct language_table *lang_entry;
+    for(lang_entry = lang->entrys[cindex]; lang_entry; lang_entry = lang_entry->next) {
+        if(!strcmp(lang_entry->ident, ident)) break;
     }
-    
-    lang_entry->ident = strdup(ident);
+    if(!lang_entry) {
+        lang_entry = malloc(sizeof(*lang_entry));
+        if (!lang_entry) {
+            printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
+            return;
+        }
+        lang_entry->ident = strdup(ident);
+        lang_entry->next = lang->entrys[cindex];
+        lang->entrys[cindex] = lang_entry;
+    } else
+        free(lang_entry->text); //free old text (new one will be set below)
     //replace all:
     //$b to \002
     //$k to \003
@@ -157,10 +167,13 @@ void register_language_string(struct language *lang, char *ident, char *text) {
         if(a) {
             switch(a[1]) {
                 case 'b':
-                    tmp[tmppos++] = '\002';
+                    tmp[tmppos++] = 2;
                     break;
                 case 'k':
-                    tmp[tmppos++] = '\003';
+                    tmp[tmppos++] = 3;
+                    break;
+                case 'u':
+                    tmp[tmppos++] = 31;
                     break;
                 default:
                     //unknown - just write it
@@ -170,8 +183,6 @@ void register_language_string(struct language *lang, char *ident, char *text) {
         }
     } while(a);
     lang_entry->text = strdup(tmp);
-    lang_entry->next = lang->entrys[cindex];
-    lang->entrys[cindex] = lang_entry;
 }
 
 char *get_language_string(struct UserNode *user, const char* msg_ident) {
@@ -201,7 +212,7 @@ char *build_language_string(struct UserNode *user, char *buffer, const char *msg
     if(buffer == NULL) {
         buffer = (char *)malloc((MAXLEN+1) * sizeof(char));
         if (!buffer) {
-            perror("malloc() failed");
+            printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
             return NULL;
         }
     }