Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-11 08:29:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix to assign valid pgrps to child processes. On GNO, we can't just use the pid as a pgrp; we must call tcnewpgrp instead.

Browse Source
This commit is contained in:
Stephen Heumann 2014-11-20 17:53:33 -06:00
parent 4d60cd1043
commit 62d8398fcf
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/platform.h
View File

@ -205,9 +205,13 @@ typedef unsigned smalluint;
#endif #endif
/* Define bb_setpgrp */ /* Define bb_setpgrp */
#if defined(__digital__) && defined(__unix__) || defined(__GNO__) #if defined(__digital__) && defined(__unix__)
/* use legacy setpgrp(pid_t, pid_t) for now. move to platform.c */ /* use legacy setpgrp(pid_t, pid_t) for now. move to platform.c */
# define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0) # define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me, __me); } while (0)
#elif defined(__GNO__)
/* On GNO, pgrps have a different (smaller) numbering space than processes,
* so in general it's not valid to set out prgp equal to our pid. */
# define bb_setpgrp() dont_use_bb_setpgrp_on_gno()
#else #else
# define bb_setpgrp() setpgrp() # define bb_setpgrp() setpgrp()
#endif #endif

39
shell/hush.c
View File

@ -7521,7 +7521,11 @@ static NOINLINE int run_pipe(struct pipe *pi)
#if ENABLE_HUSH_JOB #if ENABLE_HUSH_JOB
/* Second and next children need to know pid of first one */ /* Second and next children need to know pid of first one */
if (pi->pgrp < 0) if (pi->pgrp < 0)
# ifndef __GNO__
pi->pgrp = command->pid; pi->pgrp = command->pid;
# else
pi->pgrp = _getpgrp(command->pid);
# endif
#endif #endif
} }
@ -7545,10 +7549,41 @@ static NOINLINE int run_pipe(struct pipe *pi)
} }
/* Get a new process group ID and set our pgrp to it. */
#ifndef __GNO__
static pid_t new_pgrp(int fdtty)
{
pid_t pgrp = getpid();
setpgid(0, pgrp);
return pgrp;
}
#else
/* On GNO we can't just use our pid--pgrps have a separate, smaller range
* and need to be explicitly allocated with tcnewpgrp. */
static pid_t new_pgrp(int fdtty)
{
int result;
result = tcnewpgrp(fdtty);
if (result != 0)
return -1;
settpgrp(fdtty);
/* Set tty back to parent's pgrp for now. This may be what we want if
* this job is backgrounded. Otherwise, we'll re-set it to the new
* pgrp later. */
tctpgrp(fdtty, getppid());
return getpgrp();
}
#endif
#ifdef __ORCAC__ #ifdef __ORCAC__
# pragma databank 1 # pragma databank 1
#endif #endif
static void forked_child(void *args_struct) { static void forked_child(void *args_struct)
{
struct child_args *args = (struct child_args *)args_struct; struct child_args *args = (struct child_args *)args_struct;
#if ENABLE_HUSH_JOB #if ENABLE_HUSH_JOB
@ -7561,7 +7596,7 @@ static void forked_child(void *args_struct) {
pid_t pgrp; pid_t pgrp;
pgrp = (*args->pi_p)->pgrp; pgrp = (*args->pi_p)->pgrp;
if (pgrp < 0) /* true for 1st process only */ if (pgrp < 0) /* true for 1st process only */
pgrp = getpid(); pgrp = new_pgrp(G_interactive_fd);
if (setpgid(0, pgrp) == 0 if (setpgid(0, pgrp) == 0
&& (*args->pi_p)->followup != PIPE_BG && (*args->pi_p)->followup != PIPE_BG
&& G_saved_tty_pgrp /* we have ctty */ && G_saved_tty_pgrp /* we have ctty */