mirror of
https://github.com/tmate-io/tmate.git
synced 2024-12-25 16:19:02 +01:00
Sync OpenBSD patchset 232:
Use a temporary variable for strdup of const char *.
This commit is contained in:
parent
deac1fc188
commit
4c944910fa
@ -1,4 +1,4 @@
|
|||||||
/* $Id: environ.c,v 1.1 2009-08-09 17:48:55 tcunha Exp $ */
|
/* $Id: environ.c,v 1.2 2009-08-09 17:52:54 tcunha Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -134,14 +134,14 @@ void
|
|||||||
environ_update(const char *vars, struct environ *srcenv, struct environ *dstenv)
|
environ_update(const char *vars, struct environ *srcenv, struct environ *dstenv)
|
||||||
{
|
{
|
||||||
struct environ_entry *envent;
|
struct environ_entry *envent;
|
||||||
char *var, *next;
|
char *copyvars, *var, *next;
|
||||||
|
|
||||||
vars = next = xstrdup(vars);
|
copyvars = next = xstrdup(vars);
|
||||||
while ((var = strsep(&next, " ")) != NULL) {
|
while ((var = strsep(&next, " ")) != NULL) {
|
||||||
if ((envent = environ_find(srcenv, var)) == NULL)
|
if ((envent = environ_find(srcenv, var)) == NULL)
|
||||||
environ_set(dstenv, var, NULL);
|
environ_set(dstenv, var, NULL);
|
||||||
else
|
else
|
||||||
environ_set(dstenv, envent->name, envent->value);
|
environ_set(dstenv, envent->name, envent->value);
|
||||||
}
|
}
|
||||||
xfree(vars);
|
xfree(copyvars);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user