[PATCH 3/3] [cmd] Space does not delimit environment variable names

[Ann and Jason Edmeades]

Just tidying up a 'todo' in the tests, but set fred =1 sets
a variable 'fred ' to the value one (which works), but you
cannot subsequently echo it back.

[No bug, just some todos]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20120906/19c25e85/attachment.html>
-------------- next part --------------
From 16e9d0e3adfdae554f8fad99c7f467492702dc1f Mon Sep 17 00:00:00 2001
From: Jason Edmeades <jason at edmeades.me.uk>
Date: Thu, 6 Sep 2012 00:09:23 +0100
Subject: [PATCH 3/3] [cmd] Space does not delimit environment variable names

Just tidying up a 'todo' in the tests, but set fred =1 sets
a variable 'fred ' to the value one (which works), but you
cannot subsequently echo it back.

[No bug, just some todos]
---
 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 270692c..64a2c17 100755
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -2366,6 +2366,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 9578c75..be5c4e0 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));
-- 
1.7.5.4