fileno(3): set errno when returning -1

as required by IEEE Std 1003.1™-2024.

PR:	283014
Reported by:	Graham Percival <gperciva@tarsnap.com>
Reviewed by:	emaste, imp
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D47834
This commit is contained in:
Konstantin Belousov 2024-11-29 00:12:29 +02:00
parent 35ac34a23b
commit 7cd756ff4f
3 changed files with 38 additions and 11 deletions

View file

@ -506,10 +506,6 @@ extern int __isthreaded;
#define ferror(p) (!__isthreaded ? __sferror(p) : (ferror)(p))
#define clearerr(p) (!__isthreaded ? __sclearerr(p) : (clearerr)(p))
#if __POSIX_VISIBLE
#define fileno(p) (!__isthreaded ? __sfileno(p) : (fileno)(p))
#endif
#define getc(fp) (!__isthreaded ? __sgetc(fp) : (getc)(fp))
#define putc(x, fp) (!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))

View file

@ -110,9 +110,25 @@ before calling them.
These functions may be used to avoid the overhead of locking the stream
and to prevent races when multiple threads are operating on the same stream.
.Sh ERRORS
These functions should not fail and do not set the external
variable
These functions, except
.Fn fileno ,
should not fail and do not set the external variable
.Va errno .
.Pp
On error,
.Fn fileno
returns \-1 and sets
.Va errno
to one of the following values:
.Bl -tag -width Er
.It Bq Er EBADF
The stream is not associated with a file.
.It Bq Er EBADF
The file descriptor underlying stream is not a valid file descriptor.
.Pp
Note that detection of this condition is not reliable, the error might
be not reported.
.El
.Sh SEE ALSO
.Xr open 2 ,
.Xr fdopen 3 ,

View file

@ -33,6 +33,7 @@
*/
#include "namespace.h"
#include <errno.h>
#include <stdio.h>
#include "un-namespace.h"
#include "libc_private.h"
@ -40,14 +41,29 @@
#undef fileno
#undef fileno_unlocked
static int
__fileno_impl(FILE *fp)
{
int fd;
fd = fp->_file;
if (fd == -1)
errno = EBADF;
return (fd);
}
int
fileno(FILE *fp)
{
int fd;
FLOCKFILE(fp);
fd = __sfileno(fp);
FUNLOCKFILE(fp);
if (__isthreaded) {
FLOCKFILE(fp);
fd = __fileno_impl(fp);
FUNLOCKFILE(fp);
} else {
fd = __fileno_impl(fp);
}
return (fd);
}
@ -55,6 +71,5 @@ fileno(FILE *fp)
int
fileno_unlocked(FILE *fp)
{
return (__sfileno(fp));
return (__fileno_impl(fp));
}