/* -*-c-*-
*
- * $Id: exec.c,v 1.5 2002/01/13 14:49:03 mdw Exp $
+ * $Id: exec.c,v 1.7 2003/01/24 20:12:26 mdw Exp $
*
* Source and target for executable programs
*
/*----- Revision history --------------------------------------------------*
*
* $Log: exec.c,v $
+ * Revision 1.7 2003/01/24 20:12:26 mdw
+ * Correctly cast uid and gid sentinel values. Parse full filenames in
+ * exec arguments (can't do it for program, unfortunately, since the die is
+ * cast).
+ *
+ * Revision 1.6 2002/02/22 23:43:32 mdw
+ * Call @xfree@ rather than @free@.
+ *
* Revision 1.5 2002/01/13 14:49:03 mdw
* Track @lbuf@ changes in mLib.
*
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);
}
}
{
xa->ref--;
if (!xa->ref)
- free(xa);
+ xfree(xa);
xo->ref--;
if (!xo->ref) {
/* --- 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);
/* --- 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);
else
xept_list = xe->next;
- free(xe->desc);
+ xfree(xe->desc);
if (xe->f)
xe->f->ops->close(xe->f);
x_tidy(xe->xa, xe->xo);
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);
/* --- Now try resource limit settings --- */
+#ifdef HAVE_SETRLIMIT
if (rlimit_option(&xo->xl, sc))
CONF_ACCEPT;
+#endif
/* --- And then environment settings --- */
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 --- */
token(sc);
argc++;
}
+ conf_undelim(sc, 0, 0);
/* --- Expect the closing `]' --- */
static void xsource_destroy(source *s)
{
xsource *xs = (xsource *)s;
- free(xs->s.desc);
+ xfree(xs->s.desc);
exec_destroy(&xs->x);
DESTROY(xs);
}
static void xtarget_destroy(target *t)
{
xtarget *xt = (xtarget *)t;
- free(xt->t.desc);
+ xfree(xt->t.desc);
exec_destroy(&xt->x);
DESTROY(xt);
}