summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
authorMysterious <mysteriousragnarok@hotmail.com>2013-02-03 17:59:43 -0800
committerMysterious <mysteriousragnarok@hotmail.com>2013-02-03 17:59:43 -0800
commit9909d3bf4f4ad0acad48fbe5f1cfe69e44109da9 (patch)
treea9b1a6855824986b8bfa47a98236d30a1f2e1d33 /src/map/map.c
parentac7c180e10c5c84eae1ef8769942853ac8abc6f9 (diff)
parentfe8d3fc42729f2afc37426e26080b2d04f65d9f3 (diff)
downloadhercules-9909d3bf4f4ad0acad48fbe5f1cfe69e44109da9.tar.gz
hercules-9909d3bf4f4ad0acad48fbe5f1cfe69e44109da9.tar.bz2
hercules-9909d3bf4f4ad0acad48fbe5f1cfe69e44109da9.tar.xz
hercules-9909d3bf4f4ad0acad48fbe5f1cfe69e44109da9.zip
Merge pull request #1 from HerculesWS/master
Merging
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/map.c b/src/map/map.c
index a8521de7d..d2cc9c4a9 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1,5 +1,6 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
+// Copyright (c) Hercules dev team, licensed under GNU GPL.
+// See the LICENSE file
+// Portions Copyright (c) Athena dev team
#include "../common/cbasetypes.h"
#include "../common/core.h"
@@ -3216,7 +3217,7 @@ int map_config_read(char *cfgName)
*ptr = '\0';
if(strcmpi(w1,"timestamp_format")==0)
- strncpy(timestamp_format, w2, 20);
+ safestrncpy(timestamp_format, w2, 20);
else if(strcmpi(w1,"stdout_with_ansisequence")==0)
stdout_with_ansisequence = config_switch(w2);
else if(strcmpi(w1,"console_silent")==0) {
@@ -3267,7 +3268,7 @@ int map_config_read(char *cfgName)
else if (strcmpi(w1, "charhelp_txt") == 0)
strcpy(charhelp_txt, w2);
else if(strcmpi(w1,"db_path") == 0)
- strncpy(db_path,w2,255);
+ safestrncpy(db_path,w2,255);
else if (strcmpi(w1, "console") == 0) {
console = config_switch(w2);
if (console)