[PATCH 2/6] programs/cmd: Fix substring substitution in variable expansion.

[Eric Pouech]

From: Eric Pouech

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57290

Signed-off-by: Eric Pouech 
---
 programs/cmd/tests/test_builtins.cmd.exp | 4 ++--
 programs/cmd/wcmdmain.c                  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 273b7bc57ca..082cd62f99b 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -760,9 +760,9 @@ e@or_broken@qwerty
 ''@or_broken@'qwerty'
 r@or_broken@qwerty
 ty
-@todo_wine@azertyazERTY
+azertyazERTY
 ertyERTY
-@todo_wine@=_QWERTY
+=_QWERTY
 QWERTY
 mmydir
 ------------ Testing variable substitution ------------
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 46131cad608..466df207f12 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -638,8 +638,6 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start)
       if (equalspos == NULL) return start+1;
       s = xstrdupW(endOfVar + 1);

-      /* Null terminate both strings */
-      thisVar[lstrlenW(thisVar)-1] = 0x00;
       *equalspos = 0x00;

/* Since we need to be case insensitive, copy the 2 buffers */