X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.c;h=a66d9eedc1e0107d041f7a91a8fdcd8175d590fe;hb=b026c5ad0acc4388d05fa4768b75ee8d79403ea4;hp=a9d2c08e88d030429e637d5ae82c408260da2439;hpb=01e804f06e00c36c5680ebde07cbe17e6b256dc4;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index a9d2c08..a66d9ee 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -32,11 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WRT_TARGET
-#include <libconfig/libconfig.h>
-#else
 #include <libconfig.h>
-#endif
 
 #include "types.h"
 #include "conf.h"
@@ -135,7 +131,7 @@ const char *getStrConf(param_t param)
 			return DEFAULT_WELCOME;
 		}
 		break;
-	case DEAFULT_CHANNEL:
+	case DEFAULT_CHANNEL:
 		setting = config_lookup(&configuration, "default_channel");
 		if (!setting)
 			return "";
@@ -196,20 +192,20 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
 	setting = config_lookup(&configuration, configstr);
 	if (setting == NULL)
 		return -1; /* Required */
-	strncpy(chdesc->name, config_setting_get_string(setting), MAX_TEXT);
+	chdesc->name =  config_setting_get_string(setting);
 	
 	sprintf(configstr, "channels.[%d].parent", index);
 	setting = config_lookup(&configuration, configstr);
 	if (setting == NULL)
 		return -1; /* Required */
-	strncpy(chdesc->parent, config_setting_get_string(setting), MAX_TEXT);
+	chdesc->parent = config_setting_get_string(setting);
 	
 	sprintf(configstr, "channels.[%d].description", index);
 	setting = config_lookup(&configuration, configstr);
 	if (setting == NULL) /* Optional */
-		strncpy(chdesc->description, "", MAX_TEXT);
+		chdesc->description = NULL;
 	else
-		strncpy(chdesc->description, config_setting_get_string(setting), MAX_TEXT);
+		chdesc->description = config_setting_get_string(setting);
 	
 	sprintf(configstr, "channels.[%d].noenter", index);
 	setting = config_lookup(&configuration, configstr);
@@ -230,13 +226,13 @@ int Conf_getNextChannelLink(conf_channel_link_t *chlink, int index)
 	setting = config_lookup(&configuration, configstr);
 	if (setting == NULL)
 		return -1;
-	strncpy(chlink->source, config_setting_get_string(setting), MAX_TEXT);
+	chlink->source = config_setting_get_string(setting);
 
 	sprintf(configstr, "channel_links.[%d].destination", index);
 	setting = config_lookup(&configuration, configstr);
 	if (setting == NULL)
 		return -1;
-	strncpy(chlink->destination, config_setting_get_string(setting), MAX_TEXT);
+	chlink->destination = config_setting_get_string(setting);
 
 	return 0;
 }