/* -*-c-*-
*
- * $Id: env.c,v 1.1 1999/07/26 23:15:57 mdw Exp $
+ * $Id: env.c,v 1.4 2001/01/25 21:14:26 mdw Exp $
*
* Fiddling with environment variables
*
/*----- Revision history --------------------------------------------------*
*
* $Log: env.c,v $
+ * Revision 1.4 2001/01/25 21:14:26 mdw
+ * Nowadays, @SYM_LEN@ doesn't include the terminating null, so revise the
+ * buffer-usage calculation.
+ *
+ * Revision 1.3 2001/01/20 11:48:10 mdw
+ * Use new @SYM_LEN@ macro for name lengths.
+ *
+ * Revision 1.2 2000/06/17 10:39:00 mdw
+ * Add support for arena management.
+ *
* Revision 1.1 1999/07/26 23:15:57 mdw
* Fiddling with environment variables.
*
{
size_t eq = strcspn(name, "=");
if (name[eq] == '=') {
- q = xmalloc(eq + 1);
+ q = x_alloc(t->t.a, eq + 1);
memcpy(q, name, eq);
q[eq] = 0;
value = name + eq + 1;
if (!value) {
var *v;
if ((v = sym_find(t, name, -1, 0, 0)) != 0) {
- free(v->v);
+ x_free(t->t.a, v->v);
sym_remove(t, v);
}
} else {
unsigned found;
var *v = sym_find(t, name, -1, sizeof(*v), &found);
if (found)
- free(v->v);
- v->v = xstrdup(value);
+ x_free(t->t.a, v->v);
+ v->v = x_strdup(t->t.a, value);
}
/* --- Tidying --- */
if (q)
- free(q);
+ xfree(q);
}
/* --- @env_import@ --- *
for (sym_mkiter(&i, t); (v = sym_next(&i)) != 0; ) {
n++;
- sz += strlen(SYM_NAME(v)) + strlen(v->v) + 2;
+ sz += SYM_LEN(v) + strlen(v->v) + 2;
}
/* --- Allocate the big chunk of memory --- */
var *v;
for (sym_mkiter(&i, t); (v = sym_next(&i)) != 0; )
- free(v->v);
+ x_free(t->t.a, v->v);
sym_destroy(t);
}