cmd/tests: Convert line endings to DOS style at runtime before running batch test file

[Frédéric Delanoy]

This is needed to avoid a windows cmd bug/feature where using UNIX line endings may cause some subroutine/goto labels not to be found in certain cases
---
 programs/cmd/tests/batch.c |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c
index 03c2b56..6d7dfe7 100644
--- a/programs/cmd/tests/batch.c
+++ b/programs/cmd/tests/batch.c
@@ -25,16 +25,36 @@
 static char workdir[MAX_PATH];
 static DWORD workdir_len;
 
-/* Substitute escaped spaces with real ones */
-static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size)
+/* Convert to DOS line endings, and substitute escaped spaces with real ones */
+static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size)
 {
     static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'};
+    DWORD i, linesCount = 0;
+    const char *p = data;
     char *ptr, *new_data;
 
-    new_data = ptr = HeapAlloc(GetProcessHeap(), 0, size + 1);
-    memcpy( new_data, data, size );
-    new_data[size] = 0;
+    while (p < data + size && (p = strchr(p, '\n')))
+    {
+        linesCount++;
+        p++;
+    }
+
+    p = data;
+    ptr = new_data = HeapAlloc(GetProcessHeap(), 0, size + linesCount + 1);
+    if (new_data == NULL) return NULL;
+
+    for (i = 0; i < linesCount; i++)
+    {
+        const char *end = strchr(p, '\n');
+        memcpy(ptr, p, end - p);
+        ptr +=  end - p;
+        *ptr++ = '\r';
+        *ptr++ = '\n';
+        p = end + 1;
+    }
+    *ptr = '\0';
 
+    ptr = new_data;
     while ((ptr = strstr(ptr, escaped_space)))
     {
         char *end = ptr + sizeof(escaped_space) - 1;
@@ -233,7 +253,7 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data,
     const char *out_data, *actual_cmd_data;
     DWORD out_size, actual_cmd_size;
 
-    actual_cmd_data = replace_escaped_spaces(cmd_data, cmd_size, &actual_cmd_size);
+    actual_cmd_data = convert_input_data(cmd_data, cmd_size, &actual_cmd_size);
     if(!actual_cmd_size || !actual_cmd_data)
         goto cleanup;
 
-- 
1.7.6