From 4ea94224ffb059d8671d5d976a7b04cda30f52d7 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 4 Oct 2003 20:03:11 +0000 Subject: [PATCH] oops, fgets does not return EOF --- ChangeLog | 2 ++ cfile/cfile.c | 4 ++-- main/config.c | 12 +++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a0dc2ee..48bc34b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-10-04 Bradley Bell + * cfile/cfile.c, main/config.c: oops, fgets does not return EOF + * main/netmisc.c: change byte to sbyte, comments/whitespace 2003-10-03 Bradley Bell diff --git a/cfile/cfile.c b/cfile/cfile.c index ee21a110..42aa62e9 100644 --- a/cfile/cfile.c +++ b/cfile/cfile.c @@ -1,4 +1,4 @@ -/* $Id: cfile.c,v 1.19 2003-10-04 03:28:47 btb Exp $ */ +/* $Id: cfile.c,v 1.20 2003-10-04 20:03:11 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -648,7 +648,7 @@ char * cfgets( char * buf, size_t n, CFILE * fp ) } c = fgetc( fp->file ); if (c == EOF) - return EOF; + break; fp->raw_position++; if (c == 0 || c == 10) // Unix line ending break; diff --git a/main/config.c b/main/config.c index e71e621e..666a19ba 100644 --- a/main/config.c +++ b/main/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c,v 1.9 2003-10-04 03:28:47 btb Exp $ */ +/* $Id: config.c,v 1.10 2003-10-04 20:03:11 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -138,7 +138,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef RCS -static char rcsid[] = "$Id: config.c,v 1.9 2003-10-04 03:28:47 btb Exp $"; +static char rcsid[] = "$Id: config.c,v 1.10 2003-10-04 20:03:11 btb Exp $"; #endif ubyte Config_digi_volume = 8; @@ -324,8 +324,7 @@ int ReadConfigFile() while (!cfeof(infile)) { memset(line, 0, 80); - if (cfgets(line, 80, infile) == EOF) - break; + cfgets(line, 80, infile); ptr = &(line[0]); while (isspace(*ptr)) ptr++; @@ -498,8 +497,7 @@ int ReadConfigFile() while (!cfeof(infile)) { memset(line, 0, 80); - if (cfgets(line, 80, infile) == EOF) - break; + cfgets(line, 80, infile); ptr = &(line[0]); while (isspace(*ptr)) ptr++; @@ -672,7 +670,7 @@ int WriteConfigFile() #endif #ifdef RCS -static char rcsid[] = "$Id: config.c,v 1.9 2003-10-04 03:28:47 btb Exp $"; +static char rcsid[] = "$Id: config.c,v 1.10 2003-10-04 20:03:11 btb Exp $"; #endif #define MAX_CTB_LEN 512 -- 2.39.2