X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/28d2517c9cd3a1c6b21d0db91b93e01e9a84ed39..b69a615b311fb4081d97ccee6cd13777bcf4d5ca:/exec.c

diff --git a/exec.c b/exec.c
index d81aeae..f4c93af 100644
--- a/exec.c
+++ b/exec.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: exec.c,v 1.2 1999/10/22 22:46:17 mdw Exp $
+ * $Id: exec.c,v 1.9 2004/04/08 01:36:25 mdw Exp $
  *
  * Source and target for executable programs
  *
@@ -26,19 +26,6 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: exec.c,v $
- * 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
- * resetting their connection limits too early.
- *
- * Revision 1.1  1999/07/26 23:33:32  mdw
- * New sources and targets.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -152,7 +139,7 @@ typedef struct xept {
   struct xept *next, *prev;
   pid_t kid;
   endpt *f;
-  const char *desc;
+  char *desc;
   int st;
   xargs *xa;
   xopts *xo;
@@ -465,9 +452,9 @@ static void xenv_destroy(xenv *xe)
   while (xe) {
     xenv *xxe = xe;
     xe = xe->next;
-    free(xxe->name);
+    xfree(xxe->name);
     if (xxe->value)
-      free(xxe->value);
+      xfree(xxe->value);
     DESTROY(xxe);
   }
 }
@@ -488,7 +475,7 @@ static void x_tidy(xargs *xa, xopts *xo)
 {
   xa->ref--;
   if (!xa->ref)
-    free(xa);
+    xfree(xa);
 
   xo->ref--;
   if (!xo->ref) {
@@ -501,7 +488,7 @@ static void x_tidy(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)
 {
@@ -579,7 +566,7 @@ static void xept_attach(endpt *e, reffd *in, reffd *out)
 
     /* --- Set group id --- */
 
-    if (xo->gid != -1) {
+    if (xo->gid != (gid_t)-1) {
       if (setgid(xo->gid)) {
 	moan("couldn't set gid %i: %s", xo->gid, strerror(errno));
 	_exit(1);
@@ -593,7 +580,7 @@ static void xept_attach(endpt *e, reffd *in, reffd *out)
 
     /* --- Set uid --- */
 
-    if (xo->uid != -1) {
+    if (xo->uid != (uid_t)-1) {
       if (setuid(xo->uid)) {
 	moan("couldn't set uid %i: %s", xo->uid, strerror(errno));
 	_exit(1);
@@ -694,6 +681,7 @@ static void xept_destroy(xept *xe)
   else
     xept_list = xe->next;
 
+  xfree(xe->desc);
   if (xe->f)
     xe->f->ops->close(xe->f);
   x_tidy(xe->xa, xe->xo);
@@ -735,6 +723,7 @@ static void xept_chld(int n, void *p)
 /* --- @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:	---
@@ -742,14 +731,14 @@ static void xept_chld(int n, void *p)
  * 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);
@@ -773,7 +762,9 @@ static endpt_ops xept_ops = { xept_attach, xept_file, 0, xept_close };
 
 void exec_init(void)
 {
+#ifdef HAVE_SETRLIMIT
   rlimit_get(&exec_opts.xl);
+#endif
   sig_add(&xept_sig, SIGCHLD, xept_chld, 0);
   sym_create(&env);
   env_import(&env, environ);
@@ -878,8 +869,10 @@ static int exec_option(xdata *x, scanner *sc)
 
   /* --- Now try resource limit settings --- */
 
+#ifdef HAVE_SETRLIMIT
   if (rlimit_option(&xo->xl, sc))
     CONF_ACCEPT;
+#endif
 
   /* --- And then environment settings --- */
 
@@ -957,8 +950,12 @@ static void exec_read(xdata *x, scanner *sc)
     char *p, *q;
     char **v;
 
-    /* --- Strip off the leading `[' --- */
+    /* --- Strip off the leading `[' --- *
+     *
+     * Allow various handy filename characters to be entered without quoting.
+     */
 
+    conf_undelim(sc, "=:/.", "=:/.");
     token(sc);
 
     /* --- Read a sequence of arguments --- */
@@ -968,6 +965,7 @@ static void exec_read(xdata *x, scanner *sc)
       token(sc);
       argc++;
     }
+    conf_undelim(sc, 0, 0);
 
     /* --- Expect the closing `]' --- */
 
@@ -1026,7 +1024,7 @@ static endpt *exec_endpt(xdata *x, const char *desc)
   xe->xo = x->xo; xe->xo->ref++;
   xe->kid = -1;
   xe->f = 0;
-  xe->desc = desc;
+  xe->desc = xstrdup(desc);
   return (&xe->e);
 }
 
@@ -1104,6 +1102,7 @@ tidy:
 static void xsource_destroy(source *s)
 {
   xsource *xs = (xsource *)s;
+  xfree(xs->s.desc);
   exec_destroy(&xs->x);
   DESTROY(xs);
 }
@@ -1157,6 +1156,7 @@ static endpt *xtarget_create(target *t, const char *desc)
 static void xtarget_destroy(target *t)
 {
   xtarget *xt = (xtarget *)t;
+  xfree(xt->t.desc);
   exec_destroy(&xt->x);
   DESTROY(xt);
 }
@@ -1165,7 +1165,7 @@ static void xtarget_destroy(target *t)
 
 target_ops xtarget_ops = {
   "exec",
-  xtarget_option, xtarget_read, xtarget_create, xtarget_destroy
+  xtarget_option, xtarget_read, 0, xtarget_create, xtarget_destroy
 };
 
 /*----- That's all, folks -------------------------------------------------*/