~mdw
/
fwd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
`fw'-specific configuration code moved out. This file might become part
[fwd]
/
exec.c
diff --git
a/exec.c
b/exec.c
index
284bba4
..
28c9cd8
100644
(file)
--- a/
exec.c
+++ b/
exec.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: exec.c,v 1.
3 2000/07/01 11:28:52
mdw Exp $
+ * $Id: exec.c,v 1.
5 2002/01/13 14:49:03
mdw Exp $
*
* Source and target for executable programs
*
*
* Source and target for executable programs
*
@@
-29,6
+29,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: exec.c,v $
/*----- 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.3 2000/07/01 11:28:52 mdw
* Use new mLib selbuf features.
*
@@
-155,7
+161,7
@@
typedef struct xept {
struct xept *next, *prev;
pid_t kid;
endpt *f;
struct xept *next, *prev;
pid_t kid;
endpt *f;
- c
onst c
har *desc;
+ char *desc;
int st;
xargs *xa;
xopts *xo;
int st;
xargs *xa;
xopts *xo;
@@
-504,7
+510,7
@@
static void x_tidy(xargs *xa, xopts *xo)
/* --- @attach@ --- */
/* --- @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)
{
static void xept_attach(endpt *e, reffd *in, reffd *out)
{
@@
-697,6
+703,7
@@
static void xept_destroy(xept *xe)
else
xept_list = xe->next;
else
xept_list = xe->next;
+ free(xe->desc);
if (xe->f)
xe->f->ops->close(xe->f);
x_tidy(xe->xa, xe->xo);
if (xe->f)
xe->f->ops->close(xe->f);
x_tidy(xe->xa, xe->xo);
@@
-738,6
+745,7
@@
static void xept_chld(int n, void *p)
/* --- @xept_error@ --- *
*
* Arguments: @char *p@ = pointer to string read from stderr
/* --- @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: ---
* @void *v@ = pointer to by endpoint
*
* Returns: ---
@@
-745,7
+753,7
@@
static void xept_chld(int n, void *p)
* Use: Handles error reports from a child process.
*/
* 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)
{
xept *xe = v;
if (p)
@@
-1029,7
+1037,7
@@
static endpt *exec_endpt(xdata *x, const char *desc)
xe->xo = x->xo; xe->xo->ref++;
xe->kid = -1;
xe->f = 0;
xe->xo = x->xo; xe->xo->ref++;
xe->kid = -1;
xe->f = 0;
- xe->desc =
desc
;
+ xe->desc =
xstrdup(desc)
;
return (&xe->e);
}
return (&xe->e);
}
@@
-1107,6
+1115,7
@@
tidy:
static void xsource_destroy(source *s)
{
xsource *xs = (xsource *)s;
static void xsource_destroy(source *s)
{
xsource *xs = (xsource *)s;
+ free(xs->s.desc);
exec_destroy(&xs->x);
DESTROY(xs);
}
exec_destroy(&xs->x);
DESTROY(xs);
}
@@
-1160,6
+1169,7
@@
static endpt *xtarget_create(target *t, const char *desc)
static void xtarget_destroy(target *t)
{
xtarget *xt = (xtarget *)t;
static void xtarget_destroy(target *t)
{
xtarget *xt = (xtarget *)t;
+ free(xt->t.desc);
exec_destroy(&xt->x);
DESTROY(xt);
}
exec_destroy(&xt->x);
DESTROY(xt);
}