[Asterisk-cvs] asterisk config.c,1.70,1.71

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv1389

Modified Files:
	config.c 
Log Message:
clean up find_engine()
issue a warning when a config file mapping is found but the desired driver is not available (inspired by bug #4628)


Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- config.c	24 Jun 2005 22:45:15 -0000	1.70
+++ config.c	5 Jul 2005 21:17:58 -0000	1.71
@@ -852,32 +852,30 @@
 
 static struct ast_config_engine *find_engine(const char *filename, char *database, int dbsiz, char *table, int tabsiz) 
 {
-	struct ast_config_engine *eng, *ret=NULL;
+	struct ast_config_engine *eng, *ret = NULL;
 	struct ast_config_map *map;
 
 	ast_mutex_lock(&config_lock);
 
-	map = config_maps;
-	while (map) {
+	for (map = config_maps; map; map = map->next) {
 		if (!strcasecmp(filename, map->name)) {
-			strncpy(database, map->database, dbsiz-1);
-			if (map->table)
-				strncpy(table, map->table, tabsiz-1);
-			else
-				strncpy(table, filename, tabsiz-1);
+			ast_copy_string(database, map->database, dbsiz);
+			ast_copy_string(table, map->table ? map->table : filename, tabsiz);
 			break;
 		}
-		map = map->next;
 	}
 	if (map) {
-		for (eng = config_engine_list; eng; eng = eng->next) {
-			if (!strcmp(eng->name, map->driver)) {
+		for (eng = config_engine_list; !ret && eng; eng = eng->next) {
+			if (!strcasecmp(eng->name, map->driver))
 				ret = eng;
-				break;
-			}
 		}
 	}
+
 	ast_mutex_unlock(&config_lock);
+	
+	/* if we found a mapping, but the engine is not available, then issue a warning */
+	if (map && !ret)
+		ast_log(LOG_WARNING, "Mapping for '%s' found to engine '%s', but the engine is not available\n", map->name, map->driver);
 
 	return ret;
 }