X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=052b20f9e7aae6a9209200de05a863306f3169cf;hp=568103373c9a5a1612c22cfa779143a5a04ce07c;hb=e9576632dc4b780b867044269d06cc50f76d8c05;hpb=de78d79db84c486afcc353884ec1770866beb653 diff --git a/src/conf.c b/src/conf.c index 56810337..052b20f9 100644 --- a/src/conf.c +++ b/src/conf.c @@ -2,7 +2,7 @@ conf.c -- configuration code Copyright (C) 1998 Robert van der Meulen 1998-2005 Ivo Timmermans - 2000-2006 Guus Sliepen + 2000-2008 Guus Sliepen 2000 Cris van Pelt This program is free software; you can redistribute it and/or modify @@ -343,6 +343,11 @@ int read_config_file(avl_tree_t *config_tree, const char *fname) buffer = xmalloc(bufsize); for(;;) { + if(feof(fp)) { + err = 0; + break; + } + line = readline(fp, &buffer, &bufsize); if(!line) { @@ -350,11 +355,6 @@ int read_config_file(avl_tree_t *config_tree, const char *fname) break; } - if(feof(fp)) { - err = 0; - break; - } - lineno++; if(!*line || *line == '#')