/* --- Make a pipe for standard error --- */
if (pipe(fd)) {
- fw_log(-1, "[%s] couldn't create pipe: %s", xe->desc, strerror(errno));
+ fw_log(NOW, "[%s] couldn't create pipe: %s", xe->desc, strerror(errno));
return;
}
fdflags(fd[0], O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
/* --- Fork a child, and handle an error if there was one --- */
if ((kid = fork()) == -1) {
- fw_log(-1, "[%s] couldn't fork: %s", xe->desc, strerror(errno));
+ fw_log(NOW, "[%s] couldn't fork: %s", xe->desc, strerror(errno));
close(fd[0]);
close(fd[1]);
return;
xept_list->prev = xe;
xept_list = xe;
if (!(xe->xo->f & XF_NOLOG))
- fw_log(-1, "[%s] started with pid %i", xe->desc, kid);
+ fw_log(NOW, "[%s] started with pid %i", xe->desc, kid);
fw_inc();
return;
}
/* Nothin' doin' */;
else if (WIFEXITED(xe->st)) {
if (WEXITSTATUS(xe->st) == 0)
- fw_log(-1, "[%s] pid %i exited successfully", xe->desc, xe->kid);
+ fw_log(NOW, "[%s] pid %i exited successfully", xe->desc, xe->kid);
else {
- fw_log(-1, "[%s] pid %i failed: status %i",
+ fw_log(NOW, "[%s] pid %i failed: status %i",
xe->desc, xe->kid, WEXITSTATUS(xe->st));
}
} else if (WIFSIGNALED(xe->st)) {
sprintf(buf, "signal %i", WTERMSIG(xe->st));
s = buf;
#endif
- fw_log(-1, "[%s] pid %i failed: %s", xe->desc, xe->kid, s);
+ fw_log(NOW, "[%s] pid %i failed: %s", xe->desc, xe->kid, s);
} else
- fw_log(-1, "[%s] pid %i failed: unrecognized status", xe->desc, xe->kid);
+ fw_log(NOW, "[%s] pid %i failed: unrecognized status",
+ xe->desc, xe->kid);
/* --- Free up the parent-side resources --- */
{
xept *xe = v;
if (p)
- fw_log(-1, "[%s] pid %i: %s", xe->desc, xe->kid, p);
+ fw_log(NOW, "[%s] pid %i: %s", xe->desc, xe->kid, p);
else {
close(xe->err.reader.fd);
selbuf_destroy(&xe->err);
return (0);
xs = CREATE(xsource);
xs->s.ops = &xsource_ops;
+ xs->s.ref = 1;
+ xs->s.f = 0;
xs->s.desc = 0;
exec_read(&xs->x, sc);
return (&xs->s);
/* --- Create the endpoints --- */
if ((ee = t->ops->create(t, xs->s.desc)) == 0)
- goto tidy;
+ return;
if ((e = exec_endpt(&xs->x, xs->s.desc)) == 0) {
ee->ops->close(ee);
- goto tidy;
+ return;
}
endpt_join(e, ee, xs->s.desc);
-
- /* --- Dispose of source and target --- */
-
-tidy:
- t->ops->destroy(t);
- xsource_destroy(&xs->s);
}
/* --- @destroy@ --- */
source_ops xsource_ops = {
"exec",
- xsource_option, xsource_read, xsource_attach, xsource_destroy
+ xsource_option, xsource_read, xsource_attach, 0, xsource_destroy
};
/*----- Exec target description -------------------------------------------*/
return (0);
xt = CREATE(xtarget);
xt->t.ops = &xtarget_ops;
+ xt->t.ref = 1;
exec_read(&xt->x, sc);
exec_desc(&xt->x, &d);
xt->t.desc = xstrdup(d.buf);