/* Return a new environment object. */
struct environ *
-make_environ ()
+make_environ (void)
{
register struct environ *e;
/* Free an environment and all the strings in it. */
void
-free_environ (e)
- register struct environ *e;
+free_environ (register struct environ *e)
{
register char **vector = e->vector;
while (*vector)
- free (*vector++);
+ xfree (*vector++);
- free (e);
+ xfree (e);
}
/* Copy the environment given to this process into E.
that all strings in these environments are safe to free. */
void
-init_environ (e)
- register struct environ *e;
+init_environ (register struct environ *e)
{
extern char **environ;
register int i;
This is used to get something to pass to execve. */
char **
-environ_vector (e)
- struct environ *e;
+environ_vector (struct environ *e)
{
return e->vector;
}
/* Return the value in environment E of variable VAR. */
char *
-get_in_environ (e, var)
- const struct environ *e;
- const char *var;
+get_in_environ (const struct environ *e, const char *var)
{
register int len = strlen (var);
register char **vector = e->vector;
/* Store the value in E of VAR as VALUE. */
void
-set_in_environ (e, var, value)
- struct environ *e;
- const char *var;
- const char *value;
+set_in_environ (struct environ *e, const char *var, const char *value)
{
register int i;
register int len = strlen (var);
vector[i + 1] = 0;
}
else
- free (s);
+ xfree (s);
s = (char *) xmalloc (len + strlen (value) + 2);
strcpy (s, var);
/* Remove the setting for variable VAR from environment E. */
void
-unset_in_environ (e, var)
- struct environ *e;
- char *var;
+unset_in_environ (struct environ *e, char *var)
{
register int len = strlen (var);
register char **vector = e->vector;
{
if (STREQN (s, var, len) && s[len] == '=')
{
- free (s);
+ xfree (s);
/* Walk through the vector, shuffling args down by one, including
the NULL terminator. Can't use memcpy() here since the regions
overlap, and memmove() might not be available. */