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

Use readline() in read_config_file() instead of fgets.

Browse source
This commit is contained in:
Ivo Timmermans 2000-11-29 14:27:24 +00:00
parent 8ea23d9ec3
commit 9e55426d72
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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.24 2000/11/29 14:24:40 zarq Exp $ $Id: conf.c,v 1.9.4.25 2000/11/29 14:27:24 zarq Exp $
*/ */
#include "config.h" #include "config.h"
@ -197,7 +197,7 @@ int read_config_file(config_t **base, const char *fname)
{ {
int err = -1; int err = -1;
FILE *fp; FILE *fp;
char line[MAXBUFSIZE]; /* There really should not be any line longer than this... */ char *line;
char *p, *q; char *p, *q;
int i, lineno = 0; int i, lineno = 0;
config_t *cfg; config_t *cfg;
@ -209,21 +209,15 @@ cp
for(;;) for(;;)
{ {
if(fgets(line, MAXBUFSIZE, fp) == NULL) if((line = readline(fp)) == NULL)
{ {
err = 0; err = -1;
break; break;
} }
lineno++; lineno++;
if(!index(line, '\n')) if((p = strtok(line, "\t =")) == NULL)
{
syslog(LOG_ERR, _("Line %d too long while reading config file %s"), lineno, fname);
break;
}
if((p = strtok(line, "\t\n\r =")) == NULL)
continue; /* no tokens on this line */ continue; /* no tokens on this line */
if(p[0] == '#') if(p[0] == '#')