jobs: remove unnecessary MKSH_NOPROSPECTOFWORK guards
Long time ago, upstream fixed KLIBC conflicts. As a result, MKSH_NO_SIGSUSPEND is not defined any more. I missed to remove guards with MKSH_NOPROSPECTOFWORK. modified: jobs.c
This commit is contained in:
parent
0c41f2fdc8
commit
ae3c5b8482
6
jobs.c
6
jobs.c
@ -1116,10 +1116,8 @@ j_waitj(Job *j,
|
|||||||
{
|
{
|
||||||
Proc *p;
|
Proc *p;
|
||||||
int rv;
|
int rv;
|
||||||
#ifndef MKSH_NOPROSPECTOFWORK
|
|
||||||
#ifdef MKSH_NO_SIGSUSPEND
|
#ifdef MKSH_NO_SIGSUSPEND
|
||||||
sigset_t omask;
|
sigset_t omask;
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1319,7 +1317,6 @@ j_sigchld(int sig MKSH_A_UNUSED)
|
|||||||
pid_t pid;
|
pid_t pid;
|
||||||
int status;
|
int status;
|
||||||
struct rusage ru0, ru1;
|
struct rusage ru0, ru1;
|
||||||
#ifndef MKSH_NOPROSPECTOFWORK
|
|
||||||
#ifdef MKSH_NO_SIGSUSPEND
|
#ifdef MKSH_NO_SIGSUSPEND
|
||||||
sigset_t omask;
|
sigset_t omask;
|
||||||
|
|
||||||
@ -1327,6 +1324,7 @@ j_sigchld(int sig MKSH_A_UNUSED)
|
|||||||
sigprocmask(SIG_BLOCK, &sm_sigchld, &omask);
|
sigprocmask(SIG_BLOCK, &sm_sigchld, &omask);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MKSH_NOPROSPECTOFWORK
|
||||||
/*
|
/*
|
||||||
* Don't wait for any processes if a job is partially started.
|
* Don't wait for any processes if a job is partially started.
|
||||||
* This is so we don't do away with the process group leader
|
* This is so we don't do away with the process group leader
|
||||||
@ -1409,10 +1407,8 @@ j_sigchld(int sig MKSH_A_UNUSED)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
j_sigchld_out:
|
j_sigchld_out:
|
||||||
#ifndef MKSH_NOPROSPECTOFWORK
|
|
||||||
#ifdef MKSH_NO_SIGSUSPEND
|
#ifdef MKSH_NO_SIGSUSPEND
|
||||||
sigprocmask(SIG_SETMASK, &omask, NULL);
|
sigprocmask(SIG_SETMASK, &omask, NULL);
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
errno = saved_errno;
|
errno = saved_errno;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user