formatting fixes (bug #4736)
[asterisk/asterisk.git] / config.c
index b38dc54..8b9e441 100755 (executable)
--- a/config.c
+++ b/config.c
 #include <time.h>
 #define AST_INCLUDE_GLOB 1
 #ifdef AST_INCLUDE_GLOB
-#ifdef __OSX__
+#ifdef __Darwin__
 #define GLOB_ABORTED GLOB_ABEND
 #endif
 # include <glob.h>
 #endif
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
 #include "asterisk/config.h"
 #include "asterisk/cli.h"
 #include "asterisk/lock.h"
@@ -33,8 +37,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/channel.h"
 #include "asterisk/app.h"
-#include "asterisk.h"
-#include "astconf.h"
 
 #define MAX_NESTED_COMMENTS 128
 #define COMMENT_START ";--"
@@ -80,36 +82,6 @@ struct ast_config {
        int max_include_level;
 };
 
-int ast_true(const char *s)
-{
-       if (!s)
-               return 0;
-       /* Determine if this is a true value */
-       if (!strcasecmp(s, "yes") ||
-           !strcasecmp(s, "true") ||
-           !strcasecmp(s, "y") ||
-           !strcasecmp(s, "t") ||
-           !strcasecmp(s, "1") ||
-           !strcasecmp(s, "on"))
-               return -1;
-       return 0;
-}
-
-int ast_false(const char *s)
-{
-       if (!s)
-               return 0;
-       /* Determine if this is a false value */
-       if (!strcasecmp(s, "no") ||
-           !strcasecmp(s, "false") ||
-           !strcasecmp(s, "n") ||
-           !strcasecmp(s, "f") ||
-           !strcasecmp(s, "0") ||
-           !strcasecmp(s, "off"))
-               return -1;
-       return 0;
-}
-
 struct ast_variable *ast_variable_new(const char *name, const char *value) 
 {
        struct ast_variable *variable;
@@ -220,7 +192,7 @@ struct ast_category *ast_category_new(const char *name)
        category = malloc(sizeof(struct ast_category));
        if (category) {
                memset(category, 0, sizeof(struct ast_category));
-               strncpy(category->name, name, sizeof(category->name) - 1);
+               ast_copy_string(category->name, name, sizeof(category->name));
        }
 
        return category;
@@ -323,7 +295,7 @@ struct ast_variable *ast_category_detach_variables(struct ast_category *cat)
 
 void ast_category_rename(struct ast_category *cat, const char *name)
 {
-       strncpy(cat->name, name, sizeof(cat->name) - 1);
+       ast_copy_string(cat->name, name, sizeof(cat->name));
 }
 
 static void inherit_category(struct ast_category *new, const struct ast_category *base)
@@ -486,7 +458,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                                /* #exec </path/to/executable>
                                   We create a tmp file, then we #include it, then we delete it. */
                                if (do_exec) { 
-                                       snprintf(exec_file, sizeof(exec_file), "/var/tmp/exec.%ld.%ld", time(NULL), pthread_self());
+                                       snprintf(exec_file, sizeof(exec_file), "/var/tmp/exec.%ld.%ld", time(NULL), (long)pthread_self());
                                        snprintf(cmd, sizeof(cmd), "%s > %s 2>&1", cur, exec_file);
                                        ast_safe_system(cmd);
                                        cur = exec_file;
@@ -497,7 +469,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat,
                                if(!ast_strlen_zero(exec_file))
                                        unlink(exec_file);
                                if(!do_include)
-                                       return -1;
+                                       return 0;
 
                        } else {
                                ast_log(LOG_WARNING, "Directive '#%s' needs an argument (%s) at line %d of %s\n", 
@@ -554,11 +526,12 @@ static struct ast_config *config_text_file_load(const char *database, const char
        int lineno=0;
        int comment = 0, nest[MAX_NESTED_COMMENTS];
        struct ast_category *cat = NULL;
+       int count = 0;
        
        cat = ast_config_get_current_category(cfg);
 
        if (filename[0] == '/') {
-               strncpy(fn, filename, sizeof(fn)-1);
+               ast_copy_string(fn, filename, sizeof(fn));
        } else {
                snprintf(fn, sizeof(fn), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, filename);
        }
@@ -583,13 +556,14 @@ static struct ast_config *config_text_file_load(const char *database, const char
                        /* loop over expanded files */
                        int i;
                        for (i=0; i<globbuf.gl_pathc; i++) {
-                               strncpy(fn, globbuf.gl_pathv[i], sizeof(fn)-1);
+                               ast_copy_string(fn, globbuf.gl_pathv[i], sizeof(fn));
 #endif
        if ((option_verbose > 1) && !option_debug) {
                ast_verbose(  VERBOSE_PREFIX_2 "Parsing '%s': ", fn);
                fflush(stdout);
        }
        if ((f = fopen(fn, "r"))) {
+               count++;
                if (option_debug)
                        ast_log(LOG_DEBUG, "Parsing %s\n", fn);
                else if (option_verbose > 1)
@@ -672,6 +646,8 @@ static struct ast_config *config_text_file_load(const char *database, const char
                        }
                }
 #endif
+       if (count == 0)
+               return NULL;
 
        return cfg;
 }
@@ -687,12 +663,12 @@ int config_text_file_save(const char *configfile, const struct ast_config *cfg,
        int blanklines = 0;
 
        if (configfile[0] == '/') {
-               strncpy(fn, configfile, sizeof(fn)-1);
+               ast_copy_string(fn, configfile, sizeof(fn));
        } else {
-               snprintf(fn, sizeof(fn), "%s/%s", AST_CONFIG_DIR, configfile);
+               snprintf(fn, sizeof(fn), "%s/%s", ast_config_AST_CONFIG_DIR, configfile);
        }
        time(&t);
-       strncpy(date, ctime(&t), sizeof(date) - 1);
+       ast_copy_string(date, ctime(&t), sizeof(date));
        if ((f = fopen(fn, "w"))) {
                if ((option_verbose > 1) && !option_debug)
                        ast_verbose(  VERBOSE_PREFIX_2 "Saving '%s': ", fn);
@@ -791,17 +767,19 @@ static int append_mapping(char *name, char *driver, char *database, char *table)
 
 void read_config_maps(void) 
 {
-       struct ast_config *config;
+       struct ast_config *config, *configtmp;
        struct ast_variable *v;
        char *driver, *table, *database, *stringp;
 
        clear_config_maps();
 
-       config = ast_config_new();
-       config->max_include_level = 1;
-       config = ast_config_internal_load(extconfig_conf, config);
-       if (!config)
+       configtmp = ast_config_new();
+       configtmp->max_include_level = 1;
+       config = ast_config_internal_load(extconfig_conf, configtmp);
+       if (!config) {
+               ast_config_destroy(configtmp);
                return;
+       }
 
        for (v = ast_variable_browse(config, "settings"); v; v = v->next) {
                stringp = v->value;
@@ -809,8 +787,18 @@ void read_config_maps(void)
                database = strsep(&stringp, ",");
                table = strsep(&stringp, ",");
                        
-               if (!strcmp(v->name, extconfig_conf) || !strcmp(v->name, "asterisk.conf")) {
-                       ast_log(LOG_WARNING, "Cannot bind asterisk.conf or extconfig.conf!\n");
+               if (!strcmp(v->name, extconfig_conf)) {
+                       ast_log(LOG_WARNING, "Cannot bind '%s'!\n", extconfig_conf);
+                       continue;
+               }
+
+               if (!strcmp(v->name, "asterisk.conf")) {
+                       ast_log(LOG_WARNING, "Cannot bind 'asterisk.conf'!\n");
+                       continue;
+               }
+
+               if (!strcmp(v->name, "logger.conf")) {
+                       ast_log(LOG_WARNING, "Cannot bind 'logger.conf'!\n");
                        continue;
                }
 
@@ -874,32 +862,30 @@ int ast_config_engine_deregister(struct ast_config_engine *del)
 
 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;
 }
@@ -1027,7 +1013,6 @@ static int config_command(int fd, int argc, char **argv)
                        if (!strcasecmp(map->driver, eng->name)) {
                                ast_cli(fd, "===> %s (db=%s, table=%s)\n", map->name, map->database,
                                        map->table ? map->table : map->name);
-                               break;
                        }
        }
        ast_cli(fd,"\n\n");