mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-28 01:00:52 -07:00
Code Issues Projects Releases Wiki Activity

(init_environment): Simplify code that calls ExpandEnvironmentStrings and make

Browse source 
buf1[] and buf2[] more visible for easier debugging.
This commit is contained in:
Eli Zaretskii 2006-05-19 19:29:36 +00:00
parent e00b99c818
commit 892eb23701
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/w32.c
View file

@ -1095,20 +1095,17 @@ init_environment (char ** argv)
if (lpval)
{
char buf1[SET_ENV_BUF_SIZE], buf2[SET_ENV_BUF_SIZE];
if (dwType == REG_EXPAND_SZ)
{
char buf1[SET_ENV_BUF_SIZE], buf2[SET_ENV_BUF_SIZE];
ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof(buf1));
_snprintf (buf2, sizeof(buf2)-1, "%s=%s", env_vars[i].name, buf1);
_putenv (strdup (buf2));
}
ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof(buf1));
else if (dwType == REG_SZ)
strcpy (buf1, lpval);
if (dwType == REG_EXPAND_SZ || dwType == REG_SZ)
{
char buf[SET_ENV_BUF_SIZE];
_snprintf (buf, sizeof(buf)-1, "%s=%s", env_vars[i].name, lpval);
_putenv (strdup (buf));
_snprintf (buf2, sizeof(buf2)-1, "%s=%s", env_vars[i].name,
buf1);
_putenv (strdup (buf2));
}
if (!dont_free)