[2/7] cmd: Skip tabs as well as spaces in WCMD_skip_leading_spaces (resend) (try 3)
Frédéric Delanoy
frederic.delanoy at gmail.com
Wed Aug 24 17:48:19 CDT 2011
---
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 1138485..4846cf3 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
- at todo_wine@foo
- at todo_wine@''
+foo
+''
'foo at space@'
'foo at tab@'
------------ Testing variable expansion --------------
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 0edc005..47af612 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;
}
--
1.7.6
More information about the wine-patches
mailing list