mirror of
https://github.com/tianon/docker-bash.git
synced 2026-11-19 16:06:17 +03:00
This also includes support for per-version patches, and converts some hacky code we had for devel to a proper patch file. My intent is to keep all these patches minimal -- any non-minimal patching (especially anything beyond "make it compile successfully") will likely be grounds for no longer supporting a given version. Almost all of these patches are cobbled together from later commits in Bash upstream (ie, backported fixes). Only one or two are actually pure-Tianon creations (and those are just `#include <something.h>`).
116 lines
2.3 KiB
Diff
116 lines
2.3 KiB
Diff
Description: minor fixes for Alpine 3.21+
|
|
Author: Tianon (& Chet, for fixes borrowed/backported)
|
|
|
|
diff --git a/execute_cmd.c b/execute_cmd.c
|
|
index 4ee59c11..2a3df6d6 100644
|
|
--- a/execute_cmd.c
|
|
+++ b/execute_cmd.c
|
|
@@ -2061,6 +2120,7 @@ coproc_fdrestore (cp)
|
|
void
|
|
coproc_pidchk (pid, status)
|
|
pid_t pid;
|
|
+ int status;
|
|
{
|
|
struct coproc *cp;
|
|
|
|
diff --git a/nojobs.c b/nojobs.c
|
|
index 0c9bd751..fdbe0ae0 100644
|
|
--- a/nojobs.c
|
|
+++ b/nojobs.c
|
|
@@ -46,6 +46,7 @@
|
|
#include "shell.h"
|
|
#include "jobs.h"
|
|
#include "execute_cmd.h"
|
|
+#include "trap.h"
|
|
|
|
#include "builtins/builtext.h" /* for wait_builtin */
|
|
|
|
@@ -410,6 +419,7 @@ reap_dead_jobs ()
|
|
}
|
|
|
|
/* Initialize the job control mechanism, and set up the tty stuff. */
|
|
+int
|
|
initialize_job_control (force)
|
|
int force;
|
|
{
|
|
@@ -879,6 +933,7 @@ static TTYSTRUCT shell_tty_info;
|
|
static int got_tty_state;
|
|
|
|
/* Fill the contents of shell_tty_info with the current tty info. */
|
|
+int
|
|
get_tty_state ()
|
|
{
|
|
int tty;
|
|
@@ -910,10 +966,12 @@ set_tty_state ()
|
|
}
|
|
|
|
/* Give the terminal to PGRP. */
|
|
+int
|
|
give_terminal_to (pgrp, force)
|
|
pid_t pgrp;
|
|
int force;
|
|
{
|
|
+ return 0;
|
|
}
|
|
|
|
/* Stop a pipeline. */
|
|
|
|
diff --git a/parse.y b/parse.y
|
|
index 5211fbcb..f0cdfbf4 100644
|
|
--- a/parse.y
|
|
+++ b/parse.y
|
|
@@ -69,6 +69,9 @@
|
|
|
|
#if defined (JOB_CONTROL)
|
|
# include "jobs.h"
|
|
+#else
|
|
+extern int cleanup_dead_jobs __P((void));
|
|
+extern int count_all_jobs __P((void));
|
|
#endif /* JOB_CONTROL */
|
|
|
|
#if defined (ALIAS)
|
|
|
|
diff --git a/shell.c b/shell.c
|
|
index 2fd8179b..45b77f9e 100644
|
|
--- a/shell.c
|
|
+++ b/shell.c
|
|
@@ -57,6 +59,9 @@
|
|
|
|
#if defined (JOB_CONTROL)
|
|
#include "jobs.h"
|
|
+#else
|
|
+extern int initialize_job_control __P((int));
|
|
+extern int get_tty_state __P((void));
|
|
#endif /* JOB_CONTROL */
|
|
|
|
#include "input.h"
|
|
|
|
diff --git a/sig.c b/sig.c
|
|
index 8bc45c17..d31ca87b 100644
|
|
--- a/sig.c
|
|
+++ b/sig.c
|
|
@@ -70,6 +70,10 @@ extern sh_builtin_func_t *this_shell_builtin;
|
|
|
|
extern void initialize_siglist ();
|
|
|
|
+#if !defined (JOB_CONTROL)
|
|
+extern void initialize_job_signals __P((void));
|
|
+#endif
|
|
+
|
|
/* Non-zero after SIGINT. */
|
|
volatile sig_atomic_t interrupt_state = 0;
|
|
|
|
diff --git a/siglist.h b/siglist.h
|
|
index 4cb65308..bc0ea441 100644
|
|
--- a/siglist.h
|
|
+++ b/siglist.h
|
|
@@ -18,6 +18,8 @@
|
|
along with Bash. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
+#include <string.h>
|
|
+
|
|
#if !defined (_SIGLIST_H_)
|
|
#define _SIGLIST_H_
|
|
|