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

cmd.exe: Command type with multiple files should print filenames to stderr. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46983
Signed-off-by: Bernhard Übelacker <bernhardu@mailbox.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Bernhard belacker 2019-08-20 15:46:37 +02:00 committed by Alexandre Julliard
parent 57f697e137
commit 4684e1a9c6
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/cmd/builtins.c
View File

@ -4561,8 +4561,8 @@ void WCMD_type (WCHAR *args) {
errorlevel = 1;
} else {
if (writeHeaders) {
static const WCHAR fmt[] = {'\n','%','1','\n','\n','\0'};
WCMD_output(fmt, thisArg);
static const WCHAR fmt[] = {'\n','%','1','\n','\n','\n','\0'};
WCMD_output_stderr(fmt, thisArg);
}
while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) {
if (count == 0) break; /* ReadFile reports success on EOF! */

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

@ -875,7 +875,15 @@ type ."\foobaz"
echo ---2
type ".\foobaz"
echo ---3
del foobaz
echo foo> foobay
echo ---4
type foobaz foobay > foobax 2> foobaw
echo ---5
type foobax
echo ---6
type foobaw
echo ---7
del foobaz foobay foobax foobaw
echo ------------ Testing NUL ------------
md foobar & cd foobar

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

@ -659,6 +659,20 @@ bar
---2
bar
---3
---4
---5
bar
foo
---6
foobaz
foobay
---7
------------ Testing NUL ------------
bar
bar