ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd: Misc tab fixes.

Browse Source
This commit is contained in:
Frédéric Delanoy 2011-08-25 00:48:23 +02:00 committed by Alexandre Julliard
parent eda33f22ff
commit 09655aca95
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
programs/cmd/builtins.c
View File

@ -2098,7 +2098,8 @@ void WCMD_setshow_default (const WCHAR *command) {
NORM_IGNORECASE | SORT_STRINGSORT, NORM_IGNORECASE | SORT_STRINGSORT,
command, 2, parmD, -1) == CSTR_EQUAL) { command, 2, parmD, -1) == CSTR_EQUAL) {
command += 2; command += 2;
while (*command && *command==' ') command++; while (*command && (*command==' ' || *command=='\t'))
command++;
} }
GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd); GetCurrentDirectoryW(sizeof(cwd)/sizeof(WCHAR), cwd);
@ -2309,7 +2310,7 @@ void WCMD_setshow_env (WCHAR *s) {
DWORD count; DWORD count;
s += 2; s += 2;
while (*s && *s==' ') s++; while (*s && (*s==' ' || *s=='\t')) s++;
if (*s=='\"') if (*s=='\"')
WCMD_opt_s_strip_quotes(s); WCMD_opt_s_strip_quotes(s);
@ -2406,7 +2407,7 @@ void WCMD_setshow_prompt (void) {
} }
else { else {
s = param1; s = param1;
while ((*s == '=') || (*s == ' ')) s++; while ((*s == '=') || (*s == ' ') || (*s == '\t')) s++;
if (strlenW(s) == 0) { if (strlenW(s) == 0) {
SetEnvironmentVariableW(promptW, NULL); SetEnvironmentVariableW(promptW, NULL);
} }

6
programs/cmd/tests/test_builtins.cmd
View File

@ -325,6 +325,11 @@ cd
cd ..\.. cd ..\..
cd cd
rd /Q/s foobar rd /Q/s foobar
mkdir foobar
cd /d@tab@foobar
cd
cd ..
rd /q/s foobar
echo ------------ Testing type ------------ echo ------------ Testing type ------------
echo bar> foobaz echo bar> foobaz
@ -465,6 +470,7 @@ rd /s/Q foobar
echo ...for /L echo ...for /L
rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here
for /L %%i in (1,2,0) do echo %%i for /L %%i in (1,2,0) do echo %%i
for@tab@/L %%i in (1,2,0) do echo %%i
for /L %%i in (1,2,6) do echo %%i for /L %%i in (1,2,6) do echo %%i
for /l %%i in (1 ,2,6) do echo %%i for /l %%i in (1 ,2,6) do echo %%i
for /L %%i in (a,2,3) do echo %%i for /L %%i in (a,2,3) do echo %%i

1
programs/cmd/tests/test_builtins.cmd.exp
View File

@ -247,6 +247,7 @@ Current dir: @pwd@\foobar@or_broken@Current dir:@space@
@pwd@\foobar\bar bak @pwd@\foobar\bar bak
@pwd@\foobar\bar bak @pwd@\foobar\bar bak
@pwd@ @pwd@
@pwd@\foobar
------------ Testing type ------------ ------------ Testing type ------------
@pwd@>type foobaz@space@ @pwd@>type foobaz@space@