LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.4 patch 16

Browse Source
This commit is contained in:
Chet Ramey
2018-01-29 16:04:20 -05:00
parent 9cce630e80
commit c9f1b04651
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/sh/zread.c
View File

@@ -37,7 +37,10 @@ extern int errno;
# define SEEK_CUR 1 # define SEEK_CUR 1
#endif #endif
extern int executing_builtin;
extern void check_signals_and_traps (void); extern void check_signals_and_traps (void);
extern void check_signals (void);
extern int signal_is_trapped (int); extern int signal_is_trapped (int);
/* Read LEN bytes from FD into BUF. Retry the read on EINTR. Any other /* Read LEN bytes from FD into BUF. Retry the read on EINTR. Any other
@@ -50,21 +53,13 @@ zread (fd, buf, len)
{ {
ssize_t r; ssize_t r;
#if 0
#if defined (HAVE_SIGINTERRUPT)
if (signal_is_trapped (SIGCHLD))
siginterrupt (SIGCHLD, 1);
#endif
#endif
while ((r = read (fd, buf, len)) < 0 && errno == EINTR) while ((r = read (fd, buf, len)) < 0 && errno == EINTR)
check_signals_and_traps (); /* XXX - should it be check_signals()? */ /* XXX - bash-5.0 */
/* We check executing_builtin and run traps here for backwards compatibility */
#if 0 if (executing_builtin)
#if defined (HAVE_SIGINTERRUPT) check_signals_and_traps (); /* XXX - should it be check_signals()? */
siginterrupt (SIGCHLD, 0); else
#endif check_signals ();
#endif
return r; return r;
} }

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 15 #define PATCHLEVEL 16
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */