/* -*-c-*-
*
- * $Id: exec.c,v 1.2 1999/10/22 22:46:17 mdw Exp $
+ * $Id: exec.c,v 1.5 2002/01/13 14:49:03 mdw Exp $
*
* Source and target for executable programs
*
/*----- Revision history --------------------------------------------------*
*
* $Log: exec.c,v $
+ * Revision 1.5 2002/01/13 14:49:03 mdw
+ * Track @lbuf@ changes in mLib.
+ *
+ * Revision 1.4 2001/02/03 20:30:03 mdw
+ * Support re-reading config files on SIGHUP.
+ *
+ * Revision 1.3 2000/07/01 11:28:52 mdw
+ * Use new mLib selbuf features.
+ *
* Revision 1.2 1999/10/22 22:46:17 mdw
* When a non-file endpoint is attached to a file, keep the file endpoint
* open until the nonfile is done. This stops socket sources from
struct xept *next, *prev;
pid_t kid;
endpt *f;
- const char *desc;
+ char *desc;
int st;
xargs *xa;
xopts *xo;
/* --- @attach@ --- */
-static void xept_error(char */*p*/, void */*v*/);
+static void xept_error(char */*p*/, size_t /*len*/, void */*v*/);
static void xept_attach(endpt *e, reffd *in, reffd *out)
{
else
xept_list = xe->next;
+ free(xe->desc);
if (xe->f)
xe->f->ops->close(xe->f);
x_tidy(xe->xa, xe->xo);
/* --- @xept_error@ --- *
*
* Arguments: @char *p@ = pointer to string read from stderr
+ * @size_t len@ = length of the string
* @void *v@ = pointer to by endpoint
*
* Returns: ---
* Use: Handles error reports from a child process.
*/
-static void xept_error(char *p, void *v)
+static void xept_error(char *p, size_t len, void *v)
{
xept *xe = v;
if (p)
fw_log(-1, "[%s] pid %i: %s", xe->desc, xe->kid, p);
else {
- selbuf_disable(&xe->err);
close(xe->err.reader.fd);
+ selbuf_destroy(&xe->err);
xe->e.f |= XEF_CLOSE;
if (xe->e.f & XEF_EXIT)
xept_destroy(xe);
xe->xo = x->xo; xe->xo->ref++;
xe->kid = -1;
xe->f = 0;
- xe->desc = desc;
+ xe->desc = xstrdup(desc);
return (&xe->e);
}
static void xsource_destroy(source *s)
{
xsource *xs = (xsource *)s;
+ free(xs->s.desc);
exec_destroy(&xs->x);
DESTROY(xs);
}
static void xtarget_destroy(target *t)
{
xtarget *xt = (xtarget *)t;
+ free(xt->t.desc);
exec_destroy(&xt->x);
DESTROY(xt);
}