mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-31 07:34:19 +00:00
fix nice fresh config bug
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@668 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
3d6ca65883
commit
5492b17e94
2 files changed
+10
-2
No files matched your search
+9
-2
@@ -137,7 +137,9 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
|
||||
}
|
||||
cfg->catno = 0;
|
||||
cfg->lineno = 0;
|
||||
|
||||
*var = "";
|
||||
*val = "";
|
||||
return 1;
|
||||
} else {
|
||||
switch_copy_string(cfg->category, *var, sizeof(cfg->category));
|
||||
cfg->catno++;
|
||||
@@ -145,6 +147,8 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (**var == '#' || **var == ';' || **var == '\n' || **var == '\r') {
|
||||
continue;
|
||||
}
|
||||
@@ -153,7 +157,8 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
|
||||
break;
|
||||
}
|
||||
|
||||
if ((end = strchr(*var, '#')) != 0) {
|
||||
|
||||
if ((end = strchr(*var, '#')) != 0 || (end = strchr(*var, ';')) != 0) {
|
||||
*end = '\0';
|
||||
end--;
|
||||
} else if ((end = strchr(*var, '\n')) != 0) {
|
||||
@@ -170,6 +175,7 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
|
||||
}
|
||||
*var = p;
|
||||
|
||||
|
||||
if ((*val = strchr(*var, '=')) == 0) {
|
||||
ret = -1;
|
||||
//log_printf(0, server.log, "Invalid syntax on %s: line %d\n", cfg->path, cfg->lineno);
|
||||
@@ -199,6 +205,7 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user