[PATCH v8 3/3] cmd: Fix TYPE behavior (now uses WCMD_copy_loop).

[Joe Souza]

From: Joe Souza

---
 programs/cmd/builtins.c                  | 31 ++++++++++++------------
 programs/cmd/tests/test_builtins.cmd.exp |  4 +--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 8425781d664..ff835386560 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -3433,31 +3433,30 @@ RETURN_CODE WCMD_type(WCHAR *args)
   while (argN) {
     WCHAR *thisArg = WCMD_parameter (args, argno++, &argN, FALSE, FALSE);

-    HANDLE h;
-    WCHAR buffer[512];
-    DWORD count;
+    HANDLE hIn, hOut;
+    DWORD console_mode;

if (!argN) break;

WINE_TRACE("type: Processing arg '%s'\n", wine_dbgstr_w(thisArg));
-    h = CreateFileW(thisArg, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING,
-		FILE_ATTRIBUTE_NORMAL, NULL);
-    if (h == INVALID_HANDLE_VALUE) {
+    hIn = CreateFileW(thisArg, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING,
+            FILE_ATTRIBUTE_NORMAL, NULL);
+    if (hIn == INVALID_HANDLE_VALUE) {
       WCMD_print_error ();
       WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg);
       return errorlevel = ERROR_INVALID_FUNCTION;
-    } else {
-      if (writeHeaders) {
-        WCMD_output_stderr(L"\n%1\n\n\n", thisArg);
-      }
-      while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) {
-        if (count == 0) break;	/* ReadFile reports success on EOF! */
-        buffer[count] = 0;
-        WCMD_output_asis (buffer);
-      }
-      CloseHandle (h);
     }
+    hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    if (writeHeaders) {
+      WCMD_output_stderr(L"\n%1\n\n\n", thisArg);
+    }
+
+    WCMD_copy_loop(hIn, hOut, GetConsoleMode(hIn, &console_mode) || GetConsoleMode(hOut, &console_mode));
+
+    CloseHandle (hIn);
   }
+
   return errorlevel = return_code;
 }

diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index e465ad3f8bc..f9bec6813d0 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -995,9 +995,9 @@ foobay

---7
 ---8
-@todo_wine@passed
+passed
 ---9
-@todo_wine@passed
+passed
 ------------ Testing NUL ------------
 bar
 bar