-/* $OpenBSD: jobs.c,v 1.41 2015/04/18 18:28:36 deraadt Exp $ */
+/* $OpenBSD: jobs.c,v 1.43 2015/09/10 22:48:58 nicm Exp $ */
/*-
* Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011,
- * 2012, 2013, 2014, 2015
- * Thorsten Glaser <tg@mirbsd.org>
+ * 2012, 2013, 2014, 2015, 2016
+ * mirabilos <m@mirbsd.org>
*
* Provided that these terms and disclaimer and all copyright notices
* are retained or reproduced in an accompanying document, permission
#include "sh.h"
-__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.112 2015/04/19 14:40:09 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.121 2016/07/25 00:04:44 tg Exp $");
#if HAVE_KILLPG
#define mksh_killpg killpg
int state;
int status; /* wait status */
/* process command string from vistree */
- char command[256 - (ALLOC_SIZE + sizeof(Proc *) + sizeof(pid_t) +
- 2 * sizeof(int))];
+ char command[256 - (ALLOC_OVERHEAD + sizeof(Proc *) +
+ sizeof(pid_t) + 2 * sizeof(int))];
};
/* Notify/print flag - j_print() argument */
int flags; /* see JF_* */
volatile int state; /* job state */
int status; /* exit status of last process */
- int32_t age; /* number of jobs started */
+ int age; /* number of jobs started */
Coproc_id coproc_id; /* 0 or id of coprocess output pipe */
#ifndef MKSH_UNEMPLOYED
mksh_ttyst ttystat; /* saved tty state for stopped jobs */
static pid_t async_pid;
static int nzombie; /* # of zombies owned by this process */
-static int32_t njobs; /* # of jobs started */
+static int njobs; /* # of jobs started */
#ifndef CHILD_MAX
#define CHILD_MAX 25
{
switch (p->state) {
case PEXITED:
- return (WEXITSTATUS(p->status));
+ return ((WEXITSTATUS(p->status)) & 255);
case PSIGNALLED:
- return (128 + WTERMSIG(p->status));
+ return (ksh_sigmask(WTERMSIG(p->status)));
default:
return (0);
}
mksh_tcset(tty_fd, &tty_state);
if (restore_ttypgrp >= 0) {
if (tcsetpgrp(tty_fd, restore_ttypgrp) < 0) {
- warningf(false, "%s: %s %s: %s", "j_suspend",
- "tcsetpgrp", "failed", cstrerror(errno));
+ warningf(false, Tf_ssfaileds,
+ Tj_suspend, "tcsetpgrp", cstrerror(errno));
} else if (setpgid(0, restore_ttypgrp) < 0) {
- warningf(false, "%s: %s %s: %s", "j_suspend",
- "setpgid", "failed", cstrerror(errno));
+ warningf(false, Tf_ssfaileds,
+ Tj_suspend, "setpgid", cstrerror(errno));
}
}
}
if (ttypgrp_ok) {
if (restore_ttypgrp >= 0) {
if (setpgid(0, kshpid) < 0) {
- warningf(false, "%s: %s %s: %s", "j_suspend",
- "setpgid", "failed", cstrerror(errno));
+ warningf(false, Tf_ssfaileds,
+ Tj_suspend, "setpgid", cstrerror(errno));
ttypgrp_ok = false;
} else if (tcsetpgrp(tty_fd, kshpid) < 0) {
- warningf(false, "%s: %s %s: %s", "j_suspend",
- "tcsetpgrp", "failed", cstrerror(errno));
+ warningf(false, Tf_ssfaileds,
+ Tj_suspend, "tcsetpgrp", cstrerror(errno));
ttypgrp_ok = false;
}
}
pid_t ttypgrp;
if ((ttypgrp = tcgetpgrp(tty_fd)) < 0) {
- warningf(false, "%s: %s %s: %s",
- "j_init", "tcgetpgrp", "failed",
+ warningf(false, Tf_ssfaileds,
+ "j_init", "tcgetpgrp",
cstrerror(errno));
ttypgrp_ok = false;
break;
SS_RESTORE_DFL|SS_FORCE);
if (ttypgrp_ok && kshpgrp != kshpid) {
if (setpgid(0, kshpid) < 0) {
- warningf(false, "%s: %s %s: %s", "j_init",
- "setpgid", "failed", cstrerror(errno));
+ warningf(false, Tf_ssfaileds,
+ "j_init", "setpgid", cstrerror(errno));
ttypgrp_ok = false;
} else {
if (tcsetpgrp(tty_fd, kshpid) < 0) {
- warningf(false, "%s: %s %s: %s",
- "j_init", "tcsetpgrp", "failed",
+ warningf(false, Tf_ssfaileds,
+ "j_init", "tcsetpgrp",
cstrerror(errno));
ttypgrp_ok = false;
} else
}
#ifndef MKSH_DISABLE_TTY_WARNING
if (use_tty && !ttypgrp_ok)
- warningf(false, "%s: %s", "warning",
+ warningf(false, Tf_sD_s, "warning",
"won't have full job control");
#endif
} else {
errno = 0;
/* this is gonna annoy users; complain to your distro, people! */
if (nice(ness) == -1 && (eno = errno) != 0)
- warningf(false, "%s: %s", "bgnice", cstrerror(eno));
+ warningf(false, Tf_sD_s, "bgnice", cstrerror(eno));
#else
(void)nice(ness);
#endif
if (flags & XPIPEI) {
/* continuing with a pipe */
if (!last_job)
- internal_errorf("%s %d",
- "exchild: XPIPEI and no last_job - pid",
+ internal_errorf("exchild: XPIPEI and no last_job - pid %d",
(int)procpid);
j = last_job;
if (last_proc)
#ifndef MKSH_SMALL
if (t->type == TPIPE)
unwind(LLEAVE);
- internal_warningf("%s: %s", "exchild", "execute() returned");
+ internal_warningf("%s: execute() returned", "exchild");
fptreef(shl_out, 8, "%s: tried to execute {\n\t%T\n}\n",
"exchild", t);
shf_flush(shl_out);
if (Flag(FTALKING)) {
shf_fprintf(shl_out, "[%d]", j->job);
for (p = j->proc_list; p; p = p->next)
- shf_fprintf(shl_out, " %d",
+ shf_fprintf(shl_out, Tf__d,
(int)p->pid);
shf_putchar('\n', shl_out);
shf_flush(shl_out);
j = last_job;
if (!j || !(j->flags & JF_STARTED)) {
if (!j)
- warningf(true, "%s: %s", "waitlast", "no last job");
+ warningf(true, Tf_sD_s, "waitlast", "no last job");
else
- internal_warningf("%s: %s", "waitlast", "not started");
+ internal_warningf(Tf_sD_s, "waitlast", Tnot_started);
#ifndef MKSH_NOPROSPECTOFWORK
sigprocmask(SIG_SETMASK, &omask, NULL);
#endif
sigprocmask(SIG_SETMASK, &omask, NULL);
#endif
if (ecode != JL_NOSUCH)
- bi_errorf("%s: %s", cp, lookup_msgs[ecode]);
+ bi_errorf(Tf_sD_s, cp, lookup_msgs[ecode]);
return (-1);
}
if (rv < 0)
/* we were interrupted */
- *sigp = 128 + -rv;
+ *sigp = ksh_sigmask(-rv);
return (rv);
}
#ifndef MKSH_NOPROSPECTOFWORK
sigprocmask(SIG_SETMASK, &omask, NULL);
#endif
- bi_errorf("%s: %s", cp, lookup_msgs[ecode]);
+ bi_errorf(Tf_sD_s, cp, lookup_msgs[ecode]);
return (1);
}
if (j->pgrp == 0) {
/* started when !Flag(FMONITOR) */
if (kill_job(j, sig) < 0) {
- bi_errorf("%s: %s", cp, cstrerror(errno));
+ bi_errorf(Tf_sD_s, cp, cstrerror(errno));
rv = 1;
}
} else {
mksh_killpg(j->pgrp, SIGCONT);
#endif
if (mksh_killpg(j->pgrp, sig) < 0) {
- bi_errorf("%s: %s", cp, cstrerror(errno));
+ bi_errorf(Tf_sD_s, cp, cstrerror(errno));
rv = 1;
}
}
if ((j = j_lookup(cp, &ecode)) == NULL) {
sigprocmask(SIG_SETMASK, &omask, NULL);
- bi_errorf("%s: %s", cp, lookup_msgs[ecode]);
+ bi_errorf(Tf_sD_s, cp, lookup_msgs[ecode]);
return (1);
}
if (j->flags & JF_SAVEDTTY)
mksh_tcset(tty_fd, &tty_state);
sigprocmask(SIG_SETMASK, &omask, NULL);
- bi_errorf("%s %s(%d, %ld) %s: %s",
- "1st", "tcsetpgrp", tty_fd,
+ bi_errorf(Tf_ldfailed,
+ "fg: 1st", "tcsetpgrp", tty_fd,
(long)((j->flags & JF_SAVEDTTYPGRP) ?
- j->saved_ttypgrp : j->pgrp), "failed",
+ j->saved_ttypgrp : j->pgrp),
cstrerror(rv));
return (1);
}
if (ttypgrp_ok && (j->flags & JF_SAVEDTTY))
mksh_tcset(tty_fd, &tty_state);
if (ttypgrp_ok && tcsetpgrp(tty_fd, kshpgrp) < 0)
- warningf(true, "%s %s(%d, %ld) %s: %s",
+ warningf(true, Tf_ldfailed,
"fg: 2nd", "tcsetpgrp", tty_fd,
- (long)kshpgrp, "failed", cstrerror(errno));
+ (long)kshpgrp, cstrerror(errno));
}
sigprocmask(SIG_SETMASK, &omask, NULL);
- bi_errorf("%s %s %s", "can't continue job",
+ bi_errorf(Tf_s_sD_s, "can't continue job",
cp, cstrerror(eno));
return (1);
}
#ifndef MKSH_NOPROSPECTOFWORK
sigprocmask(SIG_SETMASK, &omask, NULL);
#endif
- bi_errorf("%s: %s", cp, lookup_msgs[ecode]);
+ bi_errorf(Tf_sD_s, cp, lookup_msgs[ecode]);
return (1);
}
} else
for (j = job_list; j; j = tmp) {
tmp = j->next;
if (j->flags & JF_REMOVE)
- remove_job(j, "jobs");
+ remove_job(j, Tjobs);
}
#ifndef MKSH_NOPROSPECTOFWORK
sigprocmask(SIG_SETMASK, &omask, NULL);
if (async_job && (async_job->flags & (JF_KNOWN|JF_ZOMBIE)) == JF_ZOMBIE)
remove_job(async_job, "async");
if (!(j->flags & JF_STARTED)) {
- internal_warningf("%s: %s", "j_async", "job not started");
+ internal_warningf(Tf_sD_s, "j_async", Tjob_not_started);
return;
}
async_job = j;
(j->saved_ttypgrp = tcgetpgrp(tty_fd)) >= 0)
j->flags |= JF_SAVEDTTYPGRP;
if (tcsetpgrp(tty_fd, kshpgrp) < 0)
- warningf(true, "%s %s(%d, %ld) %s: %s",
+ warningf(true, Tf_ldfailed,
"j_waitj:", "tcsetpgrp", tty_fd,
- (long)kshpgrp, "failed", cstrerror(errno));
+ (long)kshpgrp, cstrerror(errno));
if (j->state == PSTOPPED) {
j->flags |= JF_SAVEDTTY;
mksh_tcget(tty_fd, &j->ttystat);
* even when not monitoring, but this doesn't make sense since
* a tty generated ^C goes to the whole process group)
*/
- {
- int status;
-
- status = j->last_proc->status;
- if (Flag(FMONITOR) && j->state == PSIGNALLED &&
- WIFSIGNALED(status) &&
- (sigtraps[WTERMSIG(status)].flags & TF_TTY_INTR))
- trapsig(WTERMSIG(status));
+ if (Flag(FMONITOR) && j->state == PSIGNALLED &&
+ WIFSIGNALED(j->last_proc->status)) {
+ int termsig;
+
+ if ((termsig = WTERMSIG(j->last_proc->status)) > 0 &&
+ termsig < ksh_NSIG &&
+ (sigtraps[termsig].flags & TF_TTY_INTR))
+ trapsig(termsig);
}
#endif
}
/* XXX debugging (nasty - interrupt routine using shl_out) */
if (!(j->flags & JF_STARTED)) {
- internal_warningf("check_job: job started (flags 0x%x)",
- j->flags);
+ internal_warningf("check_job: job started (flags 0x%X)",
+ (unsigned int)j->flags);
return;
}
Proc *p;
int state;
int status;
- int coredumped;
+ bool coredumped;
char jobchar = ' ';
char buf[64];
const char *filler;
* group leader (ie, !FMONITOR). We arbitrarily return
* last pid (which is what $! returns).
*/
- shf_fprintf(shf, "%d\n", (int)(j->pgrp ? j->pgrp :
+ shf_fprintf(shf, Tf_dN, (int)(j->pgrp ? j->pgrp :
(j->last_proc ? j->last_proc->pid : 0)));
return;
}
jobchar = '-';
for (p = j->proc_list; p != NULL;) {
- coredumped = 0;
+ coredumped = false;
switch (p->state) {
case PRUNNING:
memcpy(buf, "Running", 8);
break;
- case PSTOPPED:
- strlcpy(buf, sigtraps[WSTOPSIG(p->status)].mess,
- sizeof(buf));
+ case PSTOPPED: {
+ int stopsig = WSTOPSIG(p->status);
+
+ strlcpy(buf, stopsig > 0 && stopsig < ksh_NSIG ?
+ sigtraps[stopsig].mess : "Stopped", sizeof(buf));
break;
- case PEXITED:
+ }
+ case PEXITED: {
+ int exitstatus = (WEXITSTATUS(p->status)) & 255;
+
if (how == JP_SHORT)
buf[0] = '\0';
- else if (WEXITSTATUS(p->status) == 0)
+ else if (exitstatus == 0)
memcpy(buf, "Done", 5);
else
shf_snprintf(buf, sizeof(buf), "Done (%d)",
- WEXITSTATUS(p->status));
+ exitstatus);
break;
- case PSIGNALLED:
+ }
+ case PSIGNALLED: {
+ int termsig = WTERMSIG(p->status);
#ifdef WCOREDUMP
if (WCOREDUMP(p->status))
- coredumped = 1;
+ coredumped = true;
#endif
/*
* kludge for not reporting 'normal termination
* signals' (i.e. SIGINT, SIGPIPE)
*/
if (how == JP_SHORT && !coredumped &&
- (WTERMSIG(p->status) == SIGINT ||
- WTERMSIG(p->status) == SIGPIPE)) {
+ (termsig == SIGINT || termsig == SIGPIPE)) {
buf[0] = '\0';
} else
- strlcpy(buf, sigtraps[WTERMSIG(p->status)].mess,
+ strlcpy(buf, termsig > 0 && termsig < ksh_NSIG ?
+ sigtraps[termsig].mess : "Signalled",
sizeof(buf));
break;
+ }
default:
buf[0] = '\0';
}
while (p && p->state == state && p->status == status) {
if (how == JP_LONG)
shf_fprintf(shf, "%s%5d %-20s %s%s", filler,
- (int)p->pid, " ", p->command,
+ (int)p->pid, T1space, p->command,
p->next ? "|" : null);
else if (how == JP_MEDIUM)
- shf_fprintf(shf, " %s%s", p->command,
+ shf_fprintf(shf, Tf__ss, p->command,
p->next ? "|" : null);
p = p->next;
}
curr = *prev;
}
if (curr != j) {
- internal_warningf("remove_job: job %s (%s)", "not found", where);
+ internal_warningf("remove_job: job %s (%s)", Tnot_found, where);
return;
}
*prev = curr->next;
break;
case 1:
#ifndef MKSH_DISABLE_TTY_WARNING
- warningf(false, "%s: %s %s: %s",
- "No controlling tty", "open", "/dev/tty",
- cstrerror(errno));
+ warningf(false, Tf_sD_s_sD_s,
+ "No controlling tty", Topen, T_devtty, cstrerror(errno));
#endif
break;
case 2:
#ifndef MKSH_DISABLE_TTY_WARNING
- warningf(false, "%s: %s", "can't find tty fd", cstrerror(errno));
+ warningf(false, Tf_sD_s_s, Tcant_find, Ttty_fd,
+ cstrerror(errno));
#endif
break;
case 3:
- warningf(false, "%s: %s %s: %s", "j_ttyinit",
- "dup of tty fd", "failed", cstrerror(errno));
+ warningf(false, Tf_ssfaileds, "j_ttyinit",
+ Ttty_fd_dupof, cstrerror(errno));
break;
case 4:
- warningf(false, "%s: %s: %s", "j_ttyinit",
+ warningf(false, Tf_sD_sD_s, "j_ttyinit",
"can't set close-on-exec flag", cstrerror(errno));
break;
}
OSDN Git Service
