j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Allow whitespace in values.

Browse source
This commit is contained in:
Guus Sliepen 2003-08-02 15:27:24 +00:00
parent b79e55b183
commit c7bf64c794
1 changed files with 37 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/conf.c
View file

@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: conf.c,v 1.9.4.69 2003/07/24 12:08:15 guus Exp $ $Id: conf.c,v 1.9.4.70 2003/08/02 15:27:24 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -326,6 +326,7 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
char *buffer, *line; char *buffer, *line;
char *variable, *value; char *variable, *value;
int lineno = 0; int lineno = 0;
int len;
bool ignore = false; bool ignore = false;
config_t *cfg; config_t *cfg;
size_t bufsize; size_t bufsize;
@ -358,37 +359,45 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
lineno++; lineno++;
variable = strtok(line, "\t ="); if(*line == '#')
continue;
if(!variable) if(ignore) {
continue; /* no tokens on this line */ if(!strncmp(variable, "-----END", 8))
ignore = false;
if(variable[0] == '#') continue;
continue; /* comment: ignore */ }
if(!strcmp(variable, "-----BEGIN")) if(!strncmp(line, "-----BEGIN", 10)) {
ignore = true; ignore = true;
continue;
if(!ignore) {
value = strtok(NULL, "\t\n\r =");
if(!value || value[0] == '#') {
logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
variable, lineno, fname);
break;
}
cfg = new_config();
cfg->variable = xstrdup(variable);
cfg->value = xstrdup(value);
cfg->file = xstrdup(fname);
cfg->line = lineno;
config_add(config_tree, cfg);
} }
if(!strcmp(variable, "-----END")) variable = value = line;
ignore = false;
len = strcspn(value, "\t =");
value += len;
value += strspn(value, "\t ");
if(*value == '=') {
value++;
value += strspn(value, "\t ");
}
variable[len] = '\0';
if(!*value) {
logger(LOG_ERR, _("No value for variable `%s' on line %d while reading config file %s"),
variable, lineno, fname);
break;
}
logger(LOG_DEBUG, "%s=%s", variable, value);
cfg = new_config();
cfg->variable = xstrdup(variable);
cfg->value = xstrdup(value);
cfg->file = xstrdup(fname);
cfg->line = lineno;
config_add(config_tree, cfg);
} }
free(buffer); free(buffer);