add upstream patch
This commit is contained in:
licihua
parent
0bafa60eb6
commit
9bb4461423
213
bash-5.0-patch17.patch
Normal file
213
bash-5.0-patch17.patch
Normal file
@ -0,0 +1,213 @@
|
||||
From 9e49d343e3cd7e20dad1b86ebfb764e8027596a7 Mon Sep 17 00:00:00 2001
|
||||
From: Chet Ramey <chet.ramey@case.edu>
|
||||
Date: Fri, 24 Apr 2020 11:05:06 -0400
|
||||
Subject: [PATCH] Bash-5.0 patch 17: better fix for reaping process
|
||||
substitution file descriptors
|
||||
|
||||
---
|
||||
execute_cmd.c | 26 ++++++--------------------
|
||||
patchlevel.h | 2 +-
|
||||
subst.c | 35 +++++++++++++++++++++--------------
|
||||
subst.h | 5 ++---
|
||||
4 files changed, 30 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/execute_cmd.c b/execute_cmd.c
|
||||
index 3864986d..4a05758d 100644
|
||||
--- a/execute_cmd.c
|
||||
+++ b/execute_cmd.c
|
||||
@@ -564,7 +564,7 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
|
||||
volatile int save_line_number;
|
||||
#if defined (PROCESS_SUBSTITUTION)
|
||||
volatile int ofifo, nfifo, osize, saved_fifo;
|
||||
- volatile char *ofifo_list;
|
||||
+ volatile void *ofifo_list;
|
||||
#endif
|
||||
|
||||
if (breaking || continuing)
|
||||
@@ -750,12 +750,14 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
|
||||
reap_procsubs ();
|
||||
# endif
|
||||
|
||||
- if (variable_context != 0) /* XXX - also if sourcelevel != 0? */
|
||||
+ /* XXX - also if sourcelevel != 0? */
|
||||
+ if (variable_context != 0)
|
||||
{
|
||||
ofifo = num_fifos ();
|
||||
ofifo_list = copy_fifo_list ((int *)&osize);
|
||||
begin_unwind_frame ("internal_fifos");
|
||||
- add_unwind_protect (xfree, ofifo_list);
|
||||
+ if (ofifo_list)
|
||||
+ add_unwind_protect (xfree, ofifo_list);
|
||||
saved_fifo = 1;
|
||||
}
|
||||
else
|
||||
@@ -1099,26 +1101,10 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
|
||||
{
|
||||
nfifo = num_fifos ();
|
||||
if (nfifo > ofifo)
|
||||
- close_new_fifos ((char *)ofifo_list, osize);
|
||||
+ close_new_fifos ((void *)ofifo_list, osize);
|
||||
free ((void *)ofifo_list);
|
||||
discard_unwind_frame ("internal_fifos");
|
||||
}
|
||||
-# if defined (HAVE_DEV_FD)
|
||||
- /* Reap process substitutions at the end of loops */
|
||||
- switch (command->type)
|
||||
- {
|
||||
- case cm_while:
|
||||
- case cm_until:
|
||||
- case cm_for:
|
||||
- case cm_group:
|
||||
-# if defined (ARITH_FOR_COMMAND)
|
||||
- case cm_arith_for:
|
||||
-# endif
|
||||
- reap_procsubs ();
|
||||
- default:
|
||||
- break;
|
||||
- }
|
||||
-# endif /* HAVE_DEV_FD */
|
||||
#endif
|
||||
|
||||
/* Invert the return value if we have to */
|
||||
diff --git a/patchlevel.h b/patchlevel.h
|
||||
index 9074f4dd..98e714da 100644
|
||||
--- a/patchlevel.h
|
||||
+++ b/patchlevel.h
|
||||
@@ -25,6 +25,6 @@
|
||||
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
-#define PATCHLEVEL 16
|
||||
+#define PATCHLEVEL 17
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
diff --git a/subst.c b/subst.c
|
||||
index fd6db240..8884b487 100644
|
||||
--- a/subst.c
|
||||
+++ b/subst.c
|
||||
@@ -5336,13 +5336,13 @@ clear_fifo_list ()
|
||||
{
|
||||
}
|
||||
|
||||
-char *
|
||||
+void *
|
||||
copy_fifo_list (sizep)
|
||||
int *sizep;
|
||||
{
|
||||
if (sizep)
|
||||
*sizep = 0;
|
||||
- return (char *)NULL;
|
||||
+ return (void *)NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -5408,8 +5408,13 @@ unlink_fifo_list ()
|
||||
for (i = j = 0; i < nfifo; i++)
|
||||
if (fifo_list[i].file)
|
||||
{
|
||||
- fifo_list[j].file = fifo_list[i].file;
|
||||
- fifo_list[j].proc = fifo_list[i].proc;
|
||||
+ if (i != j)
|
||||
+ {
|
||||
+ fifo_list[j].file = fifo_list[i].file;
|
||||
+ fifo_list[j].proc = fifo_list[i].proc;
|
||||
+ fifo_list[i].file = (char *)NULL;
|
||||
+ fifo_list[i].proc = 0;
|
||||
+ }
|
||||
j++;
|
||||
}
|
||||
nfifo = j;
|
||||
@@ -5425,10 +5430,11 @@ unlink_fifo_list ()
|
||||
case it's larger than fifo_list_size (size of fifo_list). */
|
||||
void
|
||||
close_new_fifos (list, lsize)
|
||||
- char *list;
|
||||
+ void *list;
|
||||
int lsize;
|
||||
{
|
||||
int i;
|
||||
+ char *plist;
|
||||
|
||||
if (list == 0)
|
||||
{
|
||||
@@ -5436,8 +5442,8 @@ close_new_fifos (list, lsize)
|
||||
return;
|
||||
}
|
||||
|
||||
- for (i = 0; i < lsize; i++)
|
||||
- if (list[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1)
|
||||
+ for (plist = (char *)list, i = 0; i < lsize; i++)
|
||||
+ if (plist[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1)
|
||||
unlink_fifo (i);
|
||||
|
||||
for (i = lsize; i < fifo_list_size; i++)
|
||||
@@ -5559,22 +5565,22 @@ clear_fifo_list ()
|
||||
nfds = 0;
|
||||
}
|
||||
|
||||
-char *
|
||||
+void *
|
||||
copy_fifo_list (sizep)
|
||||
int *sizep;
|
||||
{
|
||||
- char *ret;
|
||||
+ void *ret;
|
||||
|
||||
if (nfds == 0 || totfds == 0)
|
||||
{
|
||||
if (sizep)
|
||||
*sizep = 0;
|
||||
- return (char *)NULL;
|
||||
+ return (void *)NULL;
|
||||
}
|
||||
|
||||
if (sizep)
|
||||
*sizep = totfds;
|
||||
- ret = (char *)xmalloc (totfds * sizeof (pid_t));
|
||||
+ ret = xmalloc (totfds * sizeof (pid_t));
|
||||
return (memcpy (ret, dev_fd_list, totfds * sizeof (pid_t)));
|
||||
}
|
||||
|
||||
@@ -5647,10 +5653,11 @@ unlink_fifo_list ()
|
||||
totfds (size of dev_fd_list). */
|
||||
void
|
||||
close_new_fifos (list, lsize)
|
||||
- char *list;
|
||||
+ void *list;
|
||||
int lsize;
|
||||
{
|
||||
int i;
|
||||
+ pid_t *plist;
|
||||
|
||||
if (list == 0)
|
||||
{
|
||||
@@ -5658,8 +5665,8 @@ close_new_fifos (list, lsize)
|
||||
return;
|
||||
}
|
||||
|
||||
- for (i = 0; i < lsize; i++)
|
||||
- if (list[i] == 0 && i < totfds && dev_fd_list[i])
|
||||
+ for (plist = (pid_t *)list, i = 0; i < lsize; i++)
|
||||
+ if (plist[i] == 0 && i < totfds && dev_fd_list[i])
|
||||
unlink_fifo (i);
|
||||
|
||||
for (i = lsize; i < totfds; i++)
|
||||
diff --git a/subst.h b/subst.h
|
||||
index 34763222..faf831bd 100644
|
||||
--- a/subst.h
|
||||
+++ b/subst.h
|
||||
@@ -273,9 +273,8 @@ extern int num_fifos __P((void));
|
||||
extern void unlink_fifo_list __P((void));
|
||||
extern void unlink_fifo __P((int));
|
||||
|
||||
-extern char *copy_fifo_list __P((int *));
|
||||
-extern void unlink_new_fifos __P((char *, int));
|
||||
-extern void close_new_fifos __P((char *, int));
|
||||
+extern void *copy_fifo_list __P((int *));
|
||||
+extern void close_new_fifos __P((void *, int));
|
||||
|
||||
extern void clear_fifo_list __P((void));
|
||||
|
||||
--
|
||||
2.26.2.windows.1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: bash
|
||||
Version: 5.0
|
||||
Release: 12
|
||||
Release: 14
|
||||
Summary: It is the Bourne Again Shell
|
||||
License: GPLv3
|
||||
URL: https://www.gnu.org/software/bash
|
||||
@ -27,6 +27,7 @@ Patch13: bash-5.0-patch13.patch
|
||||
Patch14: bash-5.0-patch14.patch
|
||||
Patch15: bash-5.0-patch15.patch
|
||||
Patch16: bash-5.0-patch16.patch
|
||||
Patch17: bash-5.0-patch17.patch
|
||||
|
||||
|
||||
|
||||
@ -130,6 +131,12 @@ make check
|
||||
%exclude %{_infodir}/dir
|
||||
|
||||
%changelog
|
||||
* Thu Apr 30 2020 licihua <licihua@huawei.com> - 5.0-14
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:add upstream patch
|
||||
|
||||
* Wed Apr 8 2020 openEuler Buildteam <licihua@huawei.com> - 5.0-13
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user