[PATCH 1/2] cmd: Fix some TYPE command behavior.

[Joe Souza]

From: Joe Souza

---
 programs/cmd/builtins.c | 113 +++++++++++++++++++++++++++-------------
 1 file changed, 76 insertions(+), 37 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index dd9808aa9f2..84cef7614da 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -540,6 +540,48 @@ end:
   return ret;
 }

+/****************************************************************************
+ * WCMD_copy_loop
+ *
+ * Copies from a file
+ *    optionally reading only until EOF (ascii copy)
+ * Returns TRUE on success
+ */
+static BOOL WCMD_copy_loop(HANDLE in, HANDLE out, BOOL ascii)
+{
+    BOOL   ok;
+    DWORD  bytesread, byteswritten;
+
+    /* Loop copying data from source to destination until EOF read */
+    do
+    {
+        char buffer[MAXSTRING];
+
+        ok = ReadFile(in, buffer, MAXSTRING, &bytesread, NULL);
+        if (ok) {
+
+            /* Stop at first EOF */
+            if (ascii) {
+                char *ptr = (char *)memchr((void *)buffer, '\x1a', bytesread);
+                if (ptr) bytesread = (ptr - buffer);
+            }
+
+            if (bytesread) {
+                ok = WriteFile(out, buffer, bytesread, &byteswritten, NULL);
+                if (!ok || byteswritten != bytesread) {
+                    WINE_ERR("Unexpected failure writing, rc=%ld\n",
+                             GetLastError());
+                }
+            }
+        } else {
+            WINE_ERR("Unexpected failure reading, rc=%ld\n",
+                     GetLastError());
+        }
+    } while (ok && bytesread > 0);
+
+    return ok;
+}
+
 /****************************************************************************
  * WCMD_ManualCopy
  *
@@ -552,7 +594,6 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app
 {
     HANDLE in,out;
     BOOL   ok;
-    DWORD  bytesread, byteswritten;

WINE_TRACE("Manual Copying %s to %s (ascii: %u) (append: %u)\n",
                wine_dbgstr_w(srcname), wine_dbgstr_w(dstname), ascii, append);
@@ -578,32 +619,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app
       SetFilePointer(out, 0, NULL, FILE_END);
     }

-    /* Loop copying data from source to destination until EOF read */
-    do
-    {
-      char buffer[MAXSTRING];
-
-      ok = ReadFile(in, buffer, MAXSTRING, &bytesread, NULL);
-      if (ok) {
-
-        /* Stop at first EOF */
-        if (ascii) {
-          char *ptr = (char *)memchr((void *)buffer, '\x1a', bytesread);
-          if (ptr) bytesread = (ptr - buffer);
-        }
-
-        if (bytesread) {
-          ok = WriteFile(out, buffer, bytesread, &byteswritten, NULL);
-          if (!ok || byteswritten != bytesread) {
-            WINE_ERR("Unexpected failure writing to %s, rc=%ld\n",
-                     wine_dbgstr_w(dstname), GetLastError());
-          }
-        }
-      } else {
-        WINE_ERR("Unexpected failure reading from %s, rc=%ld\n",
-                 wine_dbgstr_w(srcname), GetLastError());
-      }
-    } while (ok && bytesread > 0);
+    ok = WCMD_copy_loop(in, out, ascii);

CloseHandle(out);
     CloseHandle(in);
@@ -3416,30 +3432,53 @@ RETURN_CODE WCMD_type(WCHAR *args)
   while (argN) {
     WCHAR *thisArg = WCMD_parameter (args, argno++, &argN, FALSE, FALSE);

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

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)) {
+    }
+    hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+    if (hOut == INVALID_HANDLE_VALUE) {
+      WCMD_print_error ();
+      WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg);
+      CloseHandle(hIn);
+      return errorlevel = ERROR_INVALID_FUNCTION;
+    }
+
+    if (writeHeaders) {
+      WCMD_output_stderr(L"\n%1\n\n\n", thisArg);
+    }
+
+    if (GetFileType(hIn) == FILE_TYPE_CHAR || GetFileType(hOut) == FILE_TYPE_CHAR) {
+      /* text mode */
+      while (WCMD_ReadFile(hIn, buffer, ARRAY_SIZE(buffer) - 1, &count)) {
         if (count == 0) break;	/* ReadFile reports success on EOF! */
         buffer[count] = 0;
+        eofchar = wcschr(buffer, L'\x1A');
+        if (eofchar) {
+          *eofchar = L'\0';
+        }
         WCMD_output_asis (buffer);
+        if (eofchar) {
+          break;
+        }
       }
-      CloseHandle (h);
+    } else {
+      /* binary mode */
+      WCMD_copy_loop(hIn, hOut, FALSE);
     }
+
+    CloseHandle (hIn);
   }
   return errorlevel = return_code;
 }