861ac185a6
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
diff --git lib/fseterr.c lib/fseterr.c
|
|
index 1e212e4..81f51ed 100644
|
|
--- a/lib/fseterr.c
|
|
+++ b/lib/fseterr.c
|
|
@@ -1,5 +1,5 @@
|
|
/* Set the error indicator of a stream.
|
|
- Copyright (C) 2007-2014 Free Software Foundation, Inc.
|
|
+ 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 the GNU General Public License as published by
|
|
@@ -12,7 +12,7 @@
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
#include <config.h>
|
|
|
|
@@ -23,21 +23,26 @@
|
|
|
|
#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
|
|
<stdio.h>, 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__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
|
|
+#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
|
|
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
|
|
fp_->_flags |= __SERR;
|
|
#elif defined __EMX__ /* emx+gcc */
|
|
fp->_flags |= _IOERR;
|
|
#elif defined __minix /* Minix */
|
|
fp->_flags |= _IOERR;
|
|
-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
|
|
+#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
|
|
fp_->_flag |= _IOERR;
|
|
#elif defined __UCLIBC__ /* uClibc */
|
|
fp->__modeflags |= __FLAG_ERROR;
|