[1/3] cmd/tests: Use plain strings instead of char arrays for keywords

[Frédéric Delanoy]

---
 programs/cmd/tests/batch.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c
index 3c12fe7..5d2668d 100644
--- a/programs/cmd/tests/batch.c
+++ b/programs/cmd/tests/batch.c
@@ -28,10 +28,10 @@ static DWORD workdir_len;
 /* Substitute escaped spaces with real ones */
 static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size)
 {
-    static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'};
+    static const char *escaped_space = "@space@";
     const char *a, *b;
     char *new_data;
-    DWORD len_space = sizeof(escaped_space) -1;
+    DWORD len_space = strlen(escaped_space);
 
     a = b = data;
     *new_size = 0;
@@ -141,15 +141,15 @@ static const char *compare_line(const char *out_line, const char *out_end, const
     const char *out_ptr = out_line, *exp_ptr = exp_line;
     const char *err = NULL;
 
-    static const char pwd_cmd[] = {'@','p','w','d','@'};
-    static const char space_cmd[] = {'@','s','p','a','c','e','@'};
-    static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'};
+    static const char *pwd_cmd = "@pwd@";
+    static const char *space_cmd = "@space@";
+    static const char *or_broken_cmd = "@or_broken@";
 
     while(exp_ptr < exp_end) {
         if(*exp_ptr == '@') {
-            if(exp_ptr+sizeof(pwd_cmd) <= exp_end
-                    && !memcmp(exp_ptr, pwd_cmd, sizeof(pwd_cmd))) {
-                exp_ptr += sizeof(pwd_cmd);
+            if(exp_ptr+strlen(pwd_cmd) <= exp_end
+                    && !strncmp(exp_ptr, pwd_cmd, strlen(pwd_cmd))) {
+                exp_ptr += strlen(pwd_cmd);
                 if(out_end-out_ptr < workdir_len
                    || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, out_ptr, workdir_len,
                        workdir, workdir_len) != CSTR_EQUAL)) {
@@ -158,15 +158,15 @@ static const char *compare_line(const char *out_line, const char *out_end, const
                     out_ptr += workdir_len;
                     continue;
                 }
-            }else if(exp_ptr+sizeof(space_cmd) <= exp_end
-                    && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) {
-                exp_ptr += sizeof(space_cmd);
+            }else if(exp_ptr+strlen(space_cmd) <= exp_end
+                    && !strncmp(exp_ptr, space_cmd, strlen(space_cmd))) {
+                exp_ptr += strlen(space_cmd);
                 ok(*out_ptr == ' ', "expected space\n");
                 if(out_ptr < out_end && *out_ptr == ' ')
                     out_ptr++;
                 continue;
-            }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end
-                     && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) {
+            }else if(exp_ptr+strlen(or_broken_cmd) <= exp_end
+                     && !strncmp(exp_ptr, or_broken_cmd, strlen(or_broken_cmd))) {
                 exp_ptr = exp_end;
                 continue;
             }
@@ -178,12 +178,12 @@ static const char *compare_line(const char *out_line, const char *out_end, const
             if(!broken(1))
                 return err;
 
-            while(exp_ptr+sizeof(or_broken_cmd) <= exp_end && memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd)))
+            while(exp_ptr+strlen(or_broken_cmd) <= exp_end && strncmp(exp_ptr,or_broken_cmd, strlen(or_broken_cmd)))
                 exp_ptr++;
             if(!exp_ptr)
                 return err;
 
-            exp_ptr += sizeof(or_broken_cmd);
+            exp_ptr += strlen(or_broken_cmd);
             out_ptr = out_line;
             err = NULL;
             continue;
-- 
1.7.5.4