commit 5cc492c78324067a9efbdc8c886aea16ae88bc46
author Jason Edmeades <jason.edmeades@googlemail.com> Sun Jun 03 22:07:39 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Jun 04 14:10:04 2007 +0200
tree 9538ecff96c92ab5209cb29d9d2ba8d4e43040de
parent a1b55be6935a6a3b44fff69eed6dfdee53d217f7

cmd.exe: Move English constants into NLS files.

programs/cmd/batch.c

diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index 0824c27..9824fe5 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -106,9 +106,9 @@
 
   while (context -> skip_rest == FALSE && WCMD_fgets (string, sizeof(string), h)) {
       if (strlen(string) == MAXSTRING -1) {
-          WCMD_output_asis( "Line in Batch processing possibly truncated. Using:\n");
+          WCMD_output_asis( WCMD_LoadMessage(WCMD_TRUNCATEDLINE));
           WCMD_output_asis( string);
-          WCMD_output_asis( "\n");
+          WCMD_output_asis( newline);
       }
       if (string[0] != ':') {                      /* Skip over labels */
           WCMD_process_command (string);
@@ -323,6 +323,7 @@
   const char validmodifiers[NUMMODIFIERS] = {
         '~', 'f', 'd', 'p', 'n', 'x', 's', 'a', 't', 'z', '$'
   };
+  const char space[] = " ";
 
   WIN32_FILE_ATTRIBUTE_DATA fileInfo;
   char  outputparam[MAX_PATH];
@@ -479,13 +480,13 @@
       int datelen;
 
       doneModifier = TRUE;
-      if (finaloutput[0] != 0x00) strcat(finaloutput, " ");
+      if (finaloutput[0] != 0x00) strcat(finaloutput, space);
 
       /* Format the time */
       FileTimeToSystemTime(&fileInfo.ftLastWriteTime, &systime);
       GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systime,
                         NULL, thisoutput, MAX_PATH);
-      strcat(thisoutput, " ");
+      strcat(thisoutput, space);
       datelen = strlen(thisoutput);
       GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &systime,
                         NULL, (thisoutput+datelen), MAX_PATH-datelen);
@@ -500,14 +501,14 @@
                                   fileInfo.nFileSizeLow;
 
       doneModifier = TRUE;
-      if (finaloutput[0] != 0x00) strcat(finaloutput, " ");
+      if (finaloutput[0] != 0x00) strcat(finaloutput, space);
       sprintf(thisoutput, "%u", fullsize);
       strcat(finaloutput, thisoutput);
     }
 
     /* 4. Handle 's' : Use short paths (File doesn't have to exist) */
     if (memchr(firstModifier, 's', modifierLen) != NULL) {
-      if (finaloutput[0] != 0x00) strcat(finaloutput, " ");
+      if (finaloutput[0] != 0x00) strcat(finaloutput, space);
       /* Don't flag as doneModifier - %~s on its own is processed later */
       GetShortPathName(outputparam, outputparam, sizeof(outputparam));
     }
@@ -516,7 +517,7 @@
     /*      Note this overrides d,p,n,x                                 */
     if (memchr(firstModifier, 'f', modifierLen) != NULL) {
       doneModifier = TRUE;
-      if (finaloutput[0] != 0x00) strcat(finaloutput, " ");
+      if (finaloutput[0] != 0x00) strcat(finaloutput, space);
       strcat(finaloutput, fullfilename);
     } else {
 
@@ -526,7 +527,7 @@
       char ext[MAX_PATH];
       BOOL doneFileModifier = FALSE;
 
-      if (finaloutput[0] != 0x00) strcat(finaloutput, " ");
+      if (finaloutput[0] != 0x00) strcat(finaloutput, space);
 
       /* Split into components */
       WCMD_splitpath(fullfilename, drive, dir, fname, ext);
@@ -563,7 +564,7 @@
       if (!doneFileModifier &&
           memchr(firstModifier, 's', modifierLen) != NULL) {
         doneModifier = TRUE;
-        if (finaloutput[0] != 0x00) strcat(finaloutput, " ");
+        if (finaloutput[0] != 0x00) strcat(finaloutput, space);
         strcat(finaloutput, outputparam);
       }
     }
@@ -611,7 +612,7 @@
       SetFilePointer(context -> h, li.u.LowPart,
                      &li.u.HighPart, FILE_BEGIN);
     } else {
-      printf("Cannot call batch label outside of a batch script\n");
+      WCMD_output_asis( WCMD_LoadMessage(WCMD_CALLINSCRIPT));
     }
   }
 }