system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 21:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

libc/stdio: only roll FILE state back on EINTR

Browse source 
Reported by:	JunT <takimoto-j@kba.biglobe.ne.jp>
PR:	266171
Reviewed by:	emaste, markj
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D36427
This commit is contained in:
Konstantin Belousov 2022-09-02 16:39:38 +03:00
parent 120bacabfd
commit 44cf1e5eb4
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/libc/stdio/fflush.c
View file

@ -136,7 +136,8 @@ __sflush(FILE *fp)
fp->_p += n;
if ((fp->_flags & (__SLBF | __SNBF)) == 0)
fp->_w -= n;
} else if (p == fp->_p) { /* cond. to handle setvbuf */
/* conditional to handle setvbuf */
} else if (p == fp->_p && errno == EINTR) {
fp->_p = old_p;
fp->_w = old_w;
}

5
lib/libc/stdio/fvwrite.c
View file

@ -38,6 +38,7 @@ static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -140,7 +141,7 @@ __sfvwrite(FILE *fp, struct __suio *uio)
fp->_p += w;
old_p = fp->_p;
if (__fflush(fp) == EOF) {
if (old_p == fp->_p)
if (old_p == fp->_p && errno == EINTR)
fp->_p -= w;
goto err;
}
@ -184,7 +185,7 @@ __sfvwrite(FILE *fp, struct __suio *uio)
fp->_p += w;
old_p = fp->_p;
if (__fflush(fp) == EOF) {
if (old_p == fp->_p)
if (old_p == fp->_p && errno == EINTR)
fp->_p -= w;
goto err;
}

2
lib/libc/stdio/wbuf.c
View file

@ -91,7 +91,7 @@ __swbuf(int c, FILE *fp)
old_p = fp->_p;
if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n')) {
if (__fflush(fp) != 0) {
if (fp->_p == old_p) {
if (fp->_p == old_p && errno == EINTR) {
fp->_p--;
fp->_w++;
}