From 48450e55f57fa57e946952d9672141378f9dcb80 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 12 2020 00:55:13 +0000 Subject: Apply patch fseterr-update-20180815.patch patch_name: fseterr-update-20180815.patch present_in_specfile: true --- diff --git a/lib/fseterr.c b/lib/fseterr.c index 4c78dc8..81f51ed 100644 --- a/lib/fseterr.c +++ b/lib/fseterr.c @@ -1,20 +1,11 @@ /* Set the error indicator of a stream. Copyright (C) 2007-2018 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or - modify it under the terms of either: + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. - * the GNU Lesser General Public License as published by the Free - Software Foundation; either version 3 of the License, or (at your - option) any later version. - - or - - * the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. - - or both in parallel, as here. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -32,13 +23,17 @@ #include "stdio-impl.h" +/* This file is not used on systems that have the __fseterr function, + namely musl libc. */ + void fseterr (FILE *fp) { /* Most systems provide FILE as a struct and the necessary bitmask in , because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags |= _IO_ERR_SEEN; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ diff --git a/lib/fseterr.h b/lib/fseterr.h index 42751e8..d616433 100644 --- a/lib/fseterr.h +++ b/lib/fseterr.h @@ -1,20 +1,11 @@ /* Set the error indicator of a stream. Copyright (C) 2007, 2009-2018 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or - modify it under the terms of either: + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. - * the GNU Lesser General Public License as published by the Free - Software Foundation; either version 3 of the License, or (at your - option) any later version. - - or - - * the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. - - or both in parallel, as here. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the