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

fix C programmer's bug number 12.2

Browse Source 
submitted by: bruce
This commit is contained in:
Wolfram Schneider 1996-11-17 02:16:34 +00:00
parent 9970cd3721
commit 5f4cf81e9d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=19829
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,7 +256,8 @@ mf_fgets(sp, spflag)
{
static FILE *f; /* Current open file */
size_t len;
char c, *p;
char *p;
int c;
if (f == NULL)
/* Advance to first non-empty file */
@ -274,7 +275,8 @@ mf_fgets(sp, spflag)
err(FATAL, "%s: %s",
fname, strerror(errno));
}
if (!feof(f)) {
if ((c = getc(f)) != EOF) {
(void)ungetc(c, f);
break;
}
(void)fclose(f);
@ -288,6 +290,8 @@ 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))
@ -296,7 +300,7 @@ mf_fgets(sp, spflag)
linenum++;
/* Advance to next non-empty file */
while (feof(f)) {
while ((c = getc(f)) == EOF) {
(void)fclose(f);
files = files->next;
if (files == NULL) {
@ -312,6 +316,7 @@ mf_fgets(sp, spflag)
err(FATAL, "%s: %s", fname, strerror(errno));
}
}
(void)ungetc(c, f);
return (1);
}