projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Backport fixes from trunk since revision 1555.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
4108d8b
..
5dc7017
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-328,6
+328,11
@@
int read_config_file(splay_tree_t *config_tree, const char *fname) {
buffer = xmalloc(bufsize);
for(;;) {
+ if(feof(fp)) {
+ err = 0;
+ break;
+ }
+
line = readline(fp, &buffer, &bufsize);
if(!line) {
@@
-335,11
+340,6
@@
int read_config_file(splay_tree_t *config_tree, const char *fname) {
break;
}
- if(feof(fp)) {
- err = 0;
- break;
- }
-
lineno++;
if(!*line || *line == '#')