From f37ab586d869e5d8811b3e7e6e8accd985a14150 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= Date: Thu, 25 Aug 2011 00:48:19 +0200 Subject: [PATCH] cmd: Skip tabs as well as spaces in WCMD_skip_leading_spaces. --- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 11384858607..4846cf348a9 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -158,8 +158,8 @@ BAZ=bazbaz bazbaz set "FOO=bar" should not include the quotes in the variable value bar -@todo_wine@foo -@todo_wine@'' +foo +'' 'foo@space@' 'foo@tab@' ------------ Testing variable expansion -------------- diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0edc00579b3..47af612bc7b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -443,7 +443,7 @@ void WCMD_strsubstW(WCHAR *start, const WCHAR *next, const WCHAR *insert, int le /*************************************************************************** * WCMD_skip_leading_spaces * - * Return a pointer to the first non-space character of string. + * Return a pointer to the first non-whitespace character of string. * Does not modify the input string. */ WCHAR *WCMD_skip_leading_spaces (WCHAR *string) { @@ -451,7 +451,7 @@ WCHAR *WCMD_skip_leading_spaces (WCHAR *string) { WCHAR *ptr; ptr = string; - while (*ptr == ' ') ptr++; + while (*ptr == ' ' || *ptr == '\t') ptr++; return ptr; } -- 2.11.4.GIT