Jason Edmeades : cmd: Space does not delimit environment variable names.
Alexandre Julliard
julliard at winehq.org
Thu Sep 6 13:37:23 CDT 2012
Module: wine
Branch: master
Commit: ebd18109189b78bb548637427b564905faa31454
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd18109189b78bb548637427b564905faa31454
Author: Jason Edmeades <jason at edmeades.me.uk>
Date: Thu Sep 6 00:09:23 2012 +0100
cmd: Space does not delimit environment variable names.
---
programs/cmd/builtins.c | 2 ++
programs/cmd/tests/test_builtins.cmd.exp | 4 ++--
programs/cmd/wcmdmain.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index a9e7473..94c7171 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -2361,6 +2361,8 @@ void WCMD_setshow_env (WCHAR *s) {
*p++ = '\0';
if (strlenW(p) == 0) p = NULL;
+ WINE_TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s),
+ wine_dbgstr_w(p));
status = SetEnvironmentVariableW(s, p);
gle = GetLastError();
if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) {
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 6a19d2c..d0a4e1f 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -203,10 +203,10 @@ baz at space@
1
0
FOOBAR not defined
- at todo_wine@ baz
+ baz
FOOBAR = baz
0
- at todo_wine@ baz2
+ baz2
0
bar
@todo_wine at FOOBAR= bar
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 93a2bb8..f762b70 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -557,7 +557,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start,
static const WCHAR Time[] = {'T','I','M','E','\0'};
static const WCHAR Cd[] = {'C','D','\0'};
static const WCHAR Random[] = {'R','A','N','D','O','M','\0'};
- static const WCHAR Delims[] = {'%',' ',':','\0'};
+ static const WCHAR Delims[] = {'%',':','\0'};
WINE_TRACE("Expanding: %s (%s,%s)\n", wine_dbgstr_w(start),
wine_dbgstr_w(forVal), wine_dbgstr_w(forVar));
More information about the wine-cvs
mailing list