Hello Ganael.
Ganael Laplanche wrote in
<2175334.ZhQv657J3T@xxxxxxxxxxxxxxxxxxxxxxxx>:
|On Tuesday, January 17, 2023 10:04:01 PM CET Steffen Nurpmeso wrote:
|> In the meantime i have taken over Jilles' commit to busybox ash,
|> hopefully correct, let's see whether it is taken.
|
|Fantastic, thanks!
|
|Any chance to get it backported to Dash too ?
Not a "backport", but from shallow testing (i have no idea what
i am doing), the attached patch works.
Ciao,
--steffen
|
|Der Kragenbaer, The moon bear,
|der holt sich munter he cheerfully and one by one
|einen nach dem anderen runter wa.ks himself off
|(By Robert Gernhardt)
From 39aa73889163629aa477adf536b557b80faa2bfc Mon Sep 17 00:00:00 2001
Message-Id: <39aa73889163629aa477adf536b557b80faa2bfc.1674083695.git.steffen@xxxxxxxxxx>
From: Steffen Nurpmeso <steffen@xxxxxxxxxx>
Date: Thu, 19 Jan 2023 00:14:22 +0100
Subject: [PATCH] Allow enabling job control without a tty in non-interactive
mode..
This is a take-over of the FreeBSD bin/sh
commit cd60e2c67d52e1f957841af19128c7227880743a
Author: Jilles Tjoelker <jilles@xxxxxxxxxxx>
AuthorDate: 2014-09-04 21:48:33 +0000
Commit: Jilles Tjoelker <jilles@xxxxxxxxxxx>
CommitDate: 2014-09-04 21:48:33 +0000
sh: Allow enabling job control without a tty in non-interactive mode.
If no tty is available, 'set -m' is still useful to put jobs in their own
process groups.
---
src/jobs.c | 125 +++++++++++++++++++++++++++++++++--------------------
1 file changed, 78 insertions(+), 47 deletions(-)
diff --git a/src/jobs.c b/src/jobs.c
index f3b9ffc285..878cc4f7c0 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -125,7 +125,7 @@ STATIC int getstatus(struct job *);
#if JOBS
static int restartjob(struct job *, int);
-static void xtcsetpgrp(int, pid_t);
+static void xtcsetpgrp(pid_t);
#endif
STATIC void
@@ -174,70 +174,95 @@ set_curjob(struct job *jp, unsigned mode)
}
}
-#if JOBS
/*
* Turn job control on and off.
- *
- * Note: This code assumes that the third arg to ioctl is a character
- * pointer, which is true on Berkeley systems but not System V. Since
- * System V doesn't have job control yet, this isn't a problem now.
- *
- * Called with interrupts off.
*/
int jobctl;
+#if JOBS
+static void
+jobctl_notty(void)
+{
+ if (ttyfd >= 0) {
+ close(ttyfd);
+ ttyfd = -1;
+ }
+ if (!iflag) {
+ setsignal(SIGTSTP);
+ setsignal(SIGTTOU);
+ setsignal(SIGTTIN);
+ jobctl = 1;
+ return;
+ }
+ sh_warnx("can't access tty; job control turned off");
+ mflag = 0;
+}
+
void
setjobctl(int on)
{
- int fd;
- int pgrp;
+ int i;
if (on == jobctl || rootshell == 0)
return;
if (on) {
- int ofd;
- ofd = fd = sh_open(_PATH_TTY, O_RDWR, 1);
- if (fd < 0) {
- fd += 3;
- while (!isatty(fd))
- if (--fd < 0)
- goto out;
+ if (ttyfd != -1)
+ close(ttyfd);
+ if ((ttyfd = open(_PATH_TTY, O_RDWR | O_CLOEXEC)) < 0) {
+ i = 0;
+ while (i <= 2 && !isatty(i))
+ i++;
+ if (i > 2 ||
+ (ttyfd = fcntl(i, F_DUPFD_CLOEXEC, 10)) < 0) {
+ jobctl_notty();
+ return;
+ }
+ }
+ if (ttyfd < 10) {
+ /*
+ * Keep our TTY file descriptor out of the way of
+ * the user's redirections.
+ */
+ if ((i = fcntl(ttyfd, F_DUPFD_CLOEXEC, 10)) < 0) {
+ jobctl_notty();
+ return;
+ }
+ close(ttyfd);
+ ttyfd = i;
}
- fd = savefd(fd, ofd);
do { /* while we are in the background */
- if ((pgrp = tcgetpgrp(fd)) < 0) {
-out:
- sh_warnx("can't access tty; job control turned off");
- mflag = on = 0;
- goto close;
+ initialpgrp = tcgetpgrp(ttyfd);
+ if (initialpgrp < 0) {
+ jobctl_notty();
+ return;
}
- if (pgrp == getpgrp())
- break;
- killpg(0, SIGTTIN);
- } while (1);
- initialpgrp = pgrp;
-
+ if (initialpgrp != getpgrp()) {
+ if (!iflag) {
+ initialpgrp = -1;
+ jobctl_notty();
+ return;
+ }
+ kill(0, SIGTTIN);
+ continue;
+ }
+ } while (0);
setsignal(SIGTSTP);
setsignal(SIGTTOU);
setsignal(SIGTTIN);
- pgrp = rootpid;
- setpgid(0, pgrp);
- xtcsetpgrp(fd, pgrp);
- } else {
- /* turning job control off */
- fd = ttyfd;
- pgrp = initialpgrp;
- xtcsetpgrp(fd, pgrp);
- setpgid(0, pgrp);
+ setpgid(0, rootpid);
+ tcsetpgrp(ttyfd, rootpid);
+ } else { /* turning job control off */
+ setpgid(0, initialpgrp);
+ if (ttyfd >= 0) {
+ tcsetpgrp(ttyfd, initialpgrp);
+ close(ttyfd);
+ ttyfd = -1;
+ }
setsignal(SIGTSTP);
setsignal(SIGTTOU);
setsignal(SIGTTIN);
-close:
- close(fd);
- fd = -1;
}
- ttyfd = fd;
jobctl = on;
}
#endif
@@ -394,7 +419,7 @@ restartjob(struct job *jp, int mode)
jp->state = JOBRUNNING;
pgid = jp->ps->pid;
if (mode == FORK_FG)
- xtcsetpgrp(ttyfd, pgid);
+ xtcsetpgrp(pgid);
killpg(pgid, SIGCONT);
ps = jp->ps;
i = jp->nprocs;
@@ -457,6 +482,9 @@ showjob(struct output *out, struct job *jp, int mode)
int indent;
char s[80];
+ if (!iflag)
+ return;
+
ps = jp->ps;
if (mode & SHOW_PGID) {
@@ -878,7 +906,7 @@ static void forkchild(struct job *jp, union node *n, int mode)
/* This can fail because we are doing it in the parent also */
(void)setpgid(0, pgrp);
if (mode == FORK_FG)
- xtcsetpgrp(ttyfd, pgrp);
+ xtcsetpgrp(pgrp);
setsignal(SIGTSTP);
setsignal(SIGTTOU);
} else
@@ -1018,7 +1046,7 @@ waitforjob(struct job *jp)
st = getstatus(jp);
#if JOBS
if (jp->jobctl) {
- xtcsetpgrp(ttyfd, rootpid);
+ xtcsetpgrp(rootpid);
/*
* This is truly gross.
* If we're doing job control, then we did a TIOCSPGRP which
@@ -1508,12 +1536,15 @@ showpipe(struct job *jp, struct output *out)
#if JOBS
STATIC void
-xtcsetpgrp(int fd, pid_t pgrp)
+xtcsetpgrp(pid_t pgrp)
{
int err;
+ if (ttyfd < 0)
+ return;
+
sigblockall(NULL);
- err = tcsetpgrp(fd, pgrp);
+ err = tcsetpgrp(ttyfd, pgrp);
sigclearmask();
if (err)
--
2.39.0
