Cygwin: Clarify some code in environ.cc
This commit is contained in:
parent
a7c23d109f
commit
1ecbb8d7b7
|
@ -545,6 +545,7 @@ _getenv_r (struct _reent *, const char *name)
|
||||||
return findenv_func (name, &offset);
|
return findenv_func (name, &offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Return size of environment block, including terminating NULL. */
|
||||||
static int __stdcall
|
static int __stdcall
|
||||||
envsize (const char * const *in_envp)
|
envsize (const char * const *in_envp)
|
||||||
{
|
{
|
||||||
|
@ -582,11 +583,16 @@ _addenv (const char *name, const char *value, int overwrite)
|
||||||
else
|
else
|
||||||
{ /* Create new slot. */
|
{ /* Create new slot. */
|
||||||
int sz = envsize (cur_environ ());
|
int sz = envsize (cur_environ ());
|
||||||
|
|
||||||
|
/* Allocate space for two new slots even though only one is needed.
|
||||||
|
According to the commit message for commit ebd645e
|
||||||
|
(2001-10-03), this is done to "work around problems with some
|
||||||
|
buggy applications." */
|
||||||
int allocsz = sz + (2 * sizeof (char *));
|
int allocsz = sz + (2 * sizeof (char *));
|
||||||
|
|
||||||
offset = (sz - 1) / sizeof (char *);
|
offset = (sz - 1) / sizeof (char *);
|
||||||
|
|
||||||
/* Allocate space for additional element plus terminating NULL. */
|
/* Allocate space for additional element. */
|
||||||
if (cur_environ () == lastenviron)
|
if (cur_environ () == lastenviron)
|
||||||
lastenviron = __cygwin_environ = (char **) realloc (cur_environ (),
|
lastenviron = __cygwin_environ = (char **) realloc (cur_environ (),
|
||||||
allocsz);
|
allocsz);
|
||||||
|
|
Loading…
Reference in New Issue