d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the C programmer's bug #1: EOF is of type int', not char'.

Browse Source 
Strong 2.2 candidate.

Submitted by:	wosch
This commit is contained in:
Joerg Wunsch 1996-11-17 00:22:54 +00:00
parent 857bb723a2
commit 771301de24
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/sed/main.c
View File

@ -274,8 +274,7 @@ mf_fgets(sp, spflag)
err(FATAL, "%s: %s",
fname, strerror(errno));
}
if ((c = getc(f)) != EOF) {
(void)ungetc(c, f);
if (!feof(f)) {
break;
}
(void)fclose(f);
@ -289,8 +288,6 @@ mf_fgets(sp, spflag)
/*
* Use fgetln so that we can handle essentially infinite input data.
* Can't use the pointer into the stdio buffer as the process space
* because the ungetc() can cause it to move.
*/
p = fgetln(f, &len);
if (ferror(f))
@ -299,7 +296,7 @@ mf_fgets(sp, spflag)
linenum++;
/* Advance to next non-empty file */
while ((c = getc(f)) == EOF) {
while (feof(f)) {
(void)fclose(f);
files = files->next;
if (files == NULL) {
@ -315,7 +312,6 @@ mf_fgets(sp, spflag)
err(FATAL, "%s: %s", fname, strerror(errno));
}
}
(void)ungetc(c, f);
return (1);
}