projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow reading config files with CRLF endings on Unix systems.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
71132c4
..
a61a359
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-1,9
+1,9
@@
/*
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
/*
conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
- 1998-200
4 Ivo Timmermans <ivo@tinc-vpn.org>
- 2000-200
4
Guus Sliepen <guus@tinc-vpn.org>
- 2000 Cris van Pelt
<tribbel@arise.dhs.org>
+ 1998-200
5 Ivo Timmermans
+ 2000-200
8
Guus Sliepen <guus@tinc-vpn.org>
+ 2000 Cris van Pelt
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-33,7
+33,8
@@
avl_tree_t *config_tree;
avl_tree_t *config_tree;
-int pingtimeout = 0; /* seconds before timeout */
+int pinginterval = 0; /* seconds between pings */
+int pingtimeout = 0; /* seconds to wait for response */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
@@
-300,6
+301,8
@@
static char *readline(FILE * fp, char **buf, size_t *buflen)
size = newsize;
} else {
*newline = '\0'; /* kill newline */
size = newsize;
} else {
*newline = '\0'; /* kill newline */
+ if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */
+ newline[-1] = '\0';
break; /* yay */
}
}
break; /* yay */
}
}
@@
-342,6
+345,11
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
buffer = xmalloc(bufsize);
for(;;) {
buffer = xmalloc(bufsize);
for(;;) {
+ if(feof(fp)) {
+ err = 0;
+ break;
+ }
+
line = readline(fp, &buffer, &bufsize);
if(!line) {
line = readline(fp, &buffer, &bufsize);
if(!line) {
@@
-349,11
+357,6
@@
int read_config_file(avl_tree_t *config_tree, const char *fname)
break;
}
break;
}
- if(feof(fp)) {
- err = 0;
- break;
- }
-
lineno++;
if(!*line || *line == '#')
lineno++;
if(!*line || *line == '#')