commit bash-20170407 snapshot

This commit is contained in:
Chet Ramey
2017-04-10 16:25:57 -04:00
parent 7c4ef411b5
commit 1a5fa30baf
43 changed files with 14065 additions and 13436 deletions
+12 -2
View File
@@ -4309,7 +4309,7 @@ mk_env_string (name, value, isfunc)
int isfunc;
{
size_t name_len, value_len;
char *p, *q;
char *p, *q, *t;
name_len = strlen (name);
value_len = STRLEN (value);
@@ -4336,7 +4336,17 @@ mk_env_string (name, value, isfunc)
q[0] = '=';
if (value && *value)
memcpy (q + 1, value, value_len + 1);
{
if (isfunc)
{
t = dequote_escapes (value);
value_len = STRLEN (t);
memcpy (q + 1, t, value_len + 1);
free (t);
}
else
memcpy (q + 1, value, value_len + 1);
}
else
q[1] = '\0';