change _T((LPTSTR)szMsg)) to (LPTSTR)szMsg)

thanks royce3 he did see my small mistage

Remove all hardcode string to En.rc 
from for.c


svn path=/trunk/; revision=14848
This commit is contained in:
Magnus Olsen 2005-04-28 20:00:37 +00:00
parent 5571662474
commit 492c96c8f9
22 changed files with 193 additions and 165 deletions

View file

@ -228,9 +228,18 @@ Type ECHO without a parameter to display the current ECHO setting."
STRING_ECHO_HELP5, "ECHO is %s\n" STRING_ECHO_HELP5, "ECHO is %s\n"
STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT"
STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n \
FOR %variable IN (set) DO command [parameters]\n\n \
%variable Specifies a replaceable parameter.\n \
(set) Specifies a set of one or more files. Wildcards may be used.\n \
command Specifies the command to carry out for each file.\n \
parameters Specifies parameters or switches for the specified command.\n\n \
To user the FOR comamnd in a batch program, specify %%variable instead of\n \
%variable."
STRING_MKDIR_HELP, "Creates a directory.\n\n \ STRING_MKDIR_HELP, "Creates a directory.\n\n \
MKDIR [drive:]path\nMD [drive:]path" MKDIR [drive:]path\nMD [drive:]path"
@ -244,6 +253,7 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]"
STRING_CHOICE_OPTION, "YN" STRING_CHOICE_OPTION, "YN"
STRING_COPY_OPTION, "YNA" STRING_COPY_OPTION, "YNA"
STRING_DEL_OPTION, "AENPQSTWXYZ" STRING_DEL_OPTION, "AENPQSTWXYZ"
@ -283,6 +293,12 @@ STRING_DEL_ERROR7, "Deleting: %s\n"
STRING_DEL_ERROR8, "No Wildcards!\n" STRING_DEL_ERROR8, "No Wildcards!\n"
STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n"
STRING_ERROR_ERROR2, "Syntax error" STRING_ERROR_ERROR2, "Syntax error"
STRING_FOR_ERROR1, "'in' missing in for statement."
STRING_FOR_ERROR2, "no brackets found."
STRING_FOR_ERROR3, "'do' missing."
STRING_FOR_ERROR4, "no command after 'do'."
STRING_FREE_ERROR1, "Invalid drive"
STRING_FREE_ERROR2, "unlabeled"
STRING_PARAM_ERROR, "Required parameter missing\n" STRING_PARAM_ERROR, "Required parameter missing\n"

View file

@ -282,7 +282,7 @@ VOID ExpandAlias (LPTSTR cmd, INT maxlen)
if ((int)(_tcslen (cmd) - len + m - n) > maxlen) if ((int)(_tcslen (cmd) - len + m - n) > maxlen)
{ {
LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ALIAS_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
/* the parser won't cause any problems with an empty line */ /* the parser won't cause any problems with an empty line */
cmd[0] = _T('\0'); cmd[0] = _T('\0');
} }
@ -311,7 +311,7 @@ INT CommandAlias (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -207,7 +207,7 @@ INT CommandAttrib (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -233,7 +233,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
return FALSE; return FALSE;
} }

View file

@ -37,7 +37,7 @@ INT cmd_beep (LPTSTR cmd, LPTSTR param)
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -53,7 +53,7 @@ INT cmd_call (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CALL_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -28,7 +28,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -39,7 +39,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
{ {
/* display active code page number */ /* display active code page number */
LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), GetConsoleCP ()); ConErrPrintf ((LPTSTR)szMsg, GetConsoleCP ());
return 0; return 0;
} }
@ -48,7 +48,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
{ {
/* too many parameters */ /* too many parameters */
LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), param); ConErrPrintf ((LPTSTR)szMsg, param);
return 1; return 1;
} }
@ -62,7 +62,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (uNewCodePage == 0) if (uNewCodePage == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), arg[0]); ConErrPrintf ((LPTSTR)szMsg, arg[0]);
freep (arg); freep (arg);
return 1; return 1;
} }
@ -70,7 +70,7 @@ INT CommandChcp (LPTSTR cmd, LPTSTR param)
if (!SetConsoleCP (uNewCodePage)) if (!SetConsoleCP (uNewCodePage))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHCP_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
else else
{ {

View file

@ -129,7 +129,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -172,7 +172,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPuts (_T((LPTSTR)szMsg)); ConErrPuts ((LPTSTR)szMsg);
freep (arg); freep (arg);
return 1; return 1;
} }
@ -203,7 +203,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
if (*s != _T(',')) if (*s != _T(','))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_TXT, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPuts (_T((LPTSTR)szMsg)); ConErrPuts ((LPTSTR)szMsg);
freep (arg); freep (arg);
return 1; return 1;
} }
@ -215,7 +215,7 @@ CommandChoice (LPTSTR cmd, LPTSTR param)
else if (arg[i][0] == _T('/')) else if (arg[i][0] == _T('/'))
{ {
LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CHOICE_ERROR_OPTION, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), arg[i]); ConErrPrintf ((LPTSTR)szMsg, arg[i]);
freep (arg); freep (arg);
return 1; return 1;
} }

View file

@ -41,7 +41,7 @@ INT cmd_cls (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CLS_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -635,14 +635,14 @@ VOID ParseCommandLine (LPTSTR cmd)
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), in); ConErrPrintf ((LPTSTR)szMsg, in);
return; return;
} }
if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) if (!SetStdHandle (STD_INPUT_HANDLE, hFile))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), in); ConErrPrintf ((LPTSTR)szMsg, in);
return; return;
} }
#ifdef _DEBUG #ifdef _DEBUG
@ -668,7 +668,7 @@ VOID ParseCommandLine (LPTSTR cmd)
if (hFile[1] == INVALID_HANDLE_VALUE){ if (hFile[1] == INVALID_HANDLE_VALUE){
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
return; return;
} }
@ -721,7 +721,7 @@ VOID ParseCommandLine (LPTSTR cmd)
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), out); ConErrPrintf ((LPTSTR)szMsg, out);
return; return;
} }
@ -729,7 +729,7 @@ VOID ParseCommandLine (LPTSTR cmd)
if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile)) if (!SetStdHandle (STD_OUTPUT_HANDLE, hFile))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), out); ConErrPrintf ((LPTSTR)szMsg, out);
return; return;
} }
@ -783,7 +783,7 @@ VOID ParseCommandLine (LPTSTR cmd)
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), err); ConErrPrintf ((LPTSTR)szMsg, err);
return; return;
} }
@ -791,7 +791,7 @@ VOID ParseCommandLine (LPTSTR cmd)
if (!SetStdHandle (STD_ERROR_HANDLE, hFile)) if (!SetStdHandle (STD_ERROR_HANDLE, hFile))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), err); ConErrPrintf ((LPTSTR)szMsg, err);
return; return;
} }
@ -1080,32 +1080,32 @@ ShowCommands (VOID)
/* print command list */ /* print command list */
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg)); ConOutPrintf ((LPTSTR)szMsg);
PrintCommandList (); PrintCommandList ();
/* print feature list */ /* print feature list */
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
#ifdef FEATURE_ALIASES #ifdef FEATURE_ALIASES
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
#endif #endif
#ifdef FEATURE_HISTORY #ifdef FEATURE_HISTORY
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
#endif #endif
#ifdef FEATURE_UNIX_FILENAME_COMPLETION #ifdef FEATURE_UNIX_FILENAME_COMPLETION
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP5, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
#endif #endif
#ifdef FEATURE_DIRECTORY_STACK #ifdef FEATURE_DIRECTORY_STACK
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP6, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
#endif #endif
#ifdef FEATURE_REDIRECTION #ifdef FEATURE_REDIRECTION
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP7, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
#endif #endif
ConOutChar (_T('\n')); ConOutChar (_T('\n'));
} }
@ -1155,7 +1155,7 @@ Initialize (int argc, TCHAR* argv[])
if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_HELP8, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
ExitProcess (0); ExitProcess (0);
} }
SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT);
@ -1260,7 +1260,7 @@ Initialize (int argc, TCHAR* argv[])
if (IsExistingFile (_T("commandline"))) if (IsExistingFile (_T("commandline")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), commandline); ConErrPrintf ((LPTSTR)szMsg, commandline);
ParseCommandLine (commandline); ParseCommandLine (commandline);
} }
} }
@ -1297,14 +1297,14 @@ static VOID Cleanup (int argc, TCHAR *argv[])
if (IsExistingFile (_T("cmdexit.bat"))) if (IsExistingFile (_T("cmdexit.bat")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
ParseCommandLine (_T("cmdexit.bat")); ParseCommandLine (_T("cmdexit.bat"));
} }
else if (IsExistingFile (_T("\\cmdexit.bat"))) else if (IsExistingFile (_T("\\cmdexit.bat")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR5, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
ParseCommandLine (_T("\\cmdexit.bat")); ParseCommandLine (_T("\\cmdexit.bat"));
} }
#ifndef __REACTOS__ #ifndef __REACTOS__
@ -1321,7 +1321,7 @@ static VOID Cleanup (int argc, TCHAR *argv[])
if (IsExistingFile (_T("commandline"))) if (IsExistingFile (_T("commandline")))
{ {
LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CMD_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), commandline); ConErrPrintf ((LPTSTR)szMsg, commandline);
ParseCommandLine (commandline); ParseCommandLine (commandline);
} }
} }

View file

@ -31,7 +31,7 @@ static VOID ColorHelp (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
} }
@ -46,7 +46,7 @@ VOID SetScreenColor (WORD wColor, BOOL bFill)
if ((wColor & 0xF) == (wColor &0xF0) >> 4) if ((wColor & 0xF) == (wColor &0xF0) >> 4)
{ {
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPuts (_T((LPTSTR)szMsg)); ConErrPuts ((LPTSTR)szMsg);
} }
else else
{ {
@ -93,17 +93,17 @@ INT CommandColor (LPTSTR first, LPTSTR rest)
if (StringToColor (&wColor, &rest) == FALSE) if (StringToColor (&wColor, &rest) == FALSE)
{ {
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPuts (_T((LPTSTR)szMsg)); ConErrPuts ((LPTSTR)szMsg);
return 1; return 1;
} }
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), wColor); ConErrPrintf ((LPTSTR)szMsg, wColor);
if ((wColor & 0xF) == (wColor &0xF0) >> 4) if ((wColor & 0xF) == (wColor &0xF0) >> 4)
{ {
LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), wColor); ConErrPrintf ((LPTSTR)szMsg, wColor);
return 1; return 1;
} }

View file

@ -234,7 +234,7 @@ VOID ConOutFormatMessage (DWORD MessageId, ...)
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_CONSOLE_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
} }

View file

@ -307,7 +307,7 @@ Overwrite (LPTSTR fn)
lpOptions = _T(Options); lpOptions = _T(Options);
LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg)); ConOutPrintf ((LPTSTR)szMsg);
ConInString (inp, 10); ConInString (inp, 10);
ConOutPuts (_T("")); ConOutPuts (_T(""));
@ -352,7 +352,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
if (hFileSrc == INVALID_HANDLE_VALUE) if (hFileSrc == INVALID_HANDLE_VALUE)
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), source); ConErrPrintf ((LPTSTR)szMsg, source);
return 0; return 0;
} }
@ -380,7 +380,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
if (!_tcscmp (dest, source)) if (!_tcscmp (dest, source))
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), source); ConErrPrintf ((LPTSTR)szMsg, source);
CloseHandle (hFileSrc); CloseHandle (hFileSrc);
return 0; return 0;
@ -457,7 +457,7 @@ int copy (LPTSTR source, LPTSTR dest, int append, LPDWORD lpdwFlags)
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
free (buffer); free (buffer);
CloseHandle (hFileDest); CloseHandle (hFileDest);
@ -656,7 +656,7 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
if (!_tcsncmp (rest, _T("/?"), 2)) if (!_tcsncmp (rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 1; return 1;
} }
@ -729,7 +729,7 @@ INT cmd_copy (LPTSTR first, LPTSTR rest)
else if (bDestFound && bWildcards) else if (bDestFound && bWildcards)
{ {
LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_COPY_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
DeleteFileList (sources); DeleteFileList (sources);
freep (p); freep (p);

View file

@ -54,17 +54,17 @@ PrintDateString (VOID)
case 0: /* mmddyy */ case 0: /* mmddyy */
default: default:
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator);
break; break;
case 1: /* ddmmyy */ case 1: /* ddmmyy */
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator);
break; break;
case 2: /* yymmdd */ case 2: /* yymmdd */
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), cDateSeparator, cDateSeparator); ConOutPrintf ((LPTSTR)szMsg, cDateSeparator, cDateSeparator);
break; break;
} }
} }
@ -194,7 +194,7 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -248,7 +248,7 @@ INT cmd_date (LPTSTR cmd, LPTSTR param)
return 0; return 0;
} }
LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DATE_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPuts (_T((LPTSTR)szMsg)); ConErrPuts ((LPTSTR)szMsg);
} }

View file

@ -122,7 +122,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), ConOutPrintf ((LPTSTR)szMsg,
lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions[9],lpOptions[10], lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions[9],lpOptions[10],
lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions[9],lpOptions[10], lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions[9],lpOptions[10],
lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions[9],lpOptions[10], lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions[9],lpOptions[10],
@ -232,7 +232,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
/* wildcards in filespec */ /* wildcards in filespec */
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
#endif #endif
GetFullPathName (arg[i], GetFullPathName (arg[i],
@ -242,10 +242,10 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); ConErrPrintf ((LPTSTR)szMsg, szFullPath);
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), pFilePart); ConErrPrintf ((LPTSTR)szMsg, pFilePart);
#endif #endif
@ -269,17 +269,17 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
#endif #endif
/* ask for deleting */ /* ask for deleting */
if (dwFlags & DEL_PROMPT) if (dwFlags & DEL_PROMPT)
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); ConErrPrintf ((LPTSTR)szMsg, szFullPath);
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg));
res = FilePromptYN (_T((LPTSTR)szMsg)); res = FilePromptYN ((LPTSTR)szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
{ {
@ -290,7 +290,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL))
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); ConErrPrintf ((LPTSTR)szMsg, szFullPath);
} }
/* delete the file */ /* delete the file */
@ -335,7 +335,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
/* no wildcards in filespec */ /* no wildcards in filespec */
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
#endif #endif
GetFullPathName (arg[i], GetFullPathName (arg[i],
MAX_PATH, MAX_PATH,
@ -346,10 +346,10 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) //Don't ask if the file doesn't exist, the following code will make the error-msg if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) //Don't ask if the file doesn't exist, the following code will make the error-msg
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); ConErrPrintf ((LPTSTR)szMsg, szFullPath);
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg));
res = FilePromptYN (_T((LPTSTR)szMsg)); res = FilePromptYN ((LPTSTR)szMsg);
if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) if ((res == PROMPT_NO) || (res == PROMPT_BREAK))
{ {
@ -359,12 +359,12 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
#ifdef _DEBUG #ifdef _DEBUG
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); ConErrPrintf ((LPTSTR)szMsg, szFullPath);
#endif #endif
if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL))
{ {
LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); ConErrPrintf ((LPTSTR)szMsg, szFullPath);
} }
if (!(dwFlags & DEL_NOTHING)) if (!(dwFlags & DEL_NOTHING))
@ -424,7 +424,7 @@ INT CommandDelete (LPTSTR cmd, LPTSTR param)
LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
} }
ConOutPrintf (_T((LPTSTR)szMsg), dwFiles); ConOutPrintf ((LPTSTR)szMsg, dwFiles);
} }
return 0; return 0;

View file

@ -24,7 +24,7 @@ INT CommandDelay (LPTSTR cmd, LPTSTR param)
if (_tcsncmp (param, _T("/?"), 2) == 0) if (_tcsncmp (param, _T("/?"), 2) == 0)
{ {
LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DELAY_HELP, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -212,7 +212,7 @@ static VOID
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
} }
@ -829,12 +829,12 @@ PrintDirectoryHeader (LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
if (szVolName[0] != _T('\0')) if (szVolName[0] != _T('\0'))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0], szVolName); ConOutPrintf ((LPTSTR)szMsg, szRootName[0], szVolName);
} }
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), szRootName[0]); ConOutPrintf ((LPTSTR)szMsg, szRootName[0]);
} }
@ -843,7 +843,7 @@ PrintDirectoryHeader (LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
/* print the volume serial number if the return was successful */ /* print the volume serial number if the return was successful */
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), ConOutPrintf ((LPTSTR)szMsg,
HIWORD(dwSerialNr), HIWORD(dwSerialNr),
LOWORD(dwSerialNr)); LOWORD(dwSerialNr));
@ -1075,7 +1075,7 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); ConvertULargeInteger (u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP5, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg),ulFiles, szBuffer); ConOutPrintf ((LPTSTR)szMsg,ulFiles, szBuffer);
} }
/* Print total directories and freespace */ /* Print total directories and freespace */
@ -1083,7 +1083,7 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
GetUserDiskFreeSpace(szRoot, &uliFree); GetUserDiskFreeSpace(szRoot, &uliFree);
ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); ConvertULargeInteger (uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP6, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg),ulDirs, szBuffer); ConOutPrintf ((LPTSTR)szMsg,ulDirs, szBuffer);
return 0; return 0;
} }
@ -1729,7 +1729,7 @@ WCHAR szMsg[RC_STRING_MAX_SIZE];
{ {
ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator);
LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIR_HELP8, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg),dwCountFiles, szBytes); ConOutPrintf ((LPTSTR)szMsg,dwCountFiles, szBytes);
} }
/* Add statistics to recursive statistics*/ /* Add statistics to recursive statistics*/

View file

@ -145,7 +145,7 @@ INT CommandPushd (LPTSTR first, LPTSTR rest)
if (!_tcsncmp (rest, _T("/?"), 2)) if (!_tcsncmp (rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -178,7 +178,7 @@ INT CommandPopd (LPTSTR first, LPTSTR rest)
if (!_tcsncmp(rest, _T("/?"), 2)) if (!_tcsncmp(rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -206,7 +206,7 @@ INT CommandDirs (LPTSTR first, LPTSTR rest)
if (!_tcsncmp(rest, _T("/?"), 2)) if (!_tcsncmp(rest, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -217,7 +217,7 @@ INT CommandDirs (LPTSTR first, LPTSTR rest)
if (lpDir == NULL) if (lpDir == NULL)
{ {
LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_DIRSTACK_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -42,7 +42,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
return 0; return 0;
} }
@ -63,7 +63,7 @@ INT CommandEcho (LPTSTR cmd, LPTSTR param)
ConOutPuts (param); ConOutPuts (param);
else { else {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf (_T((LPTSTR)szMsg), bEcho ? D_ON : D_OFF); ConOutPrintf ((LPTSTR)szMsg, bEcho ? D_ON : D_OFF);
} }
} }
@ -81,7 +81,7 @@ INT CommandEchos (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts(_T((LPTSTR)szMsg)); ConOutPuts((LPTSTR)szMsg);
return 0; return 0;
} }
@ -104,7 +104,7 @@ INT CommandEchoerr (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts(_T((LPTSTR)szMsg)); ConOutPuts((LPTSTR)szMsg);
return 0; return 0;
} }
@ -137,7 +137,7 @@ INT CommandEchoserr (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ECHO_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts(_T((LPTSTR)szMsg)); ConOutPuts((LPTSTR)szMsg);
return 0; return 0;
} }

View file

@ -72,7 +72,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
else else
{ {
LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), dwErrorCode); ConErrPrintf ((LPTSTR)szMsg, dwErrorCode);
return; return;
} }
@ -94,7 +94,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...)
default: default:
LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
return; return;
} }
@ -109,7 +109,7 @@ VOID error_parameter_format(TCHAR ch)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_PARAMETERF_ERROR, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), ch); ConErrPrintf ((LPTSTR)szMsg, ch);
} }
@ -117,7 +117,7 @@ VOID error_invalid_switch (TCHAR ch)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_SWITCH, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), ch); ConErrPrintf ((LPTSTR)szMsg, ch);
} }
@ -125,7 +125,7 @@ VOID error_too_many_parameters (LPTSTR s)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_TOO_MANY_PARAMETERS, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), s); ConErrPrintf ((LPTSTR)szMsg, s);
} }
@ -133,7 +133,7 @@ VOID error_path_not_found (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_PATH_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
@ -141,7 +141,7 @@ VOID error_file_not_found (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_FILE_NOT_FOUND, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
@ -157,7 +157,7 @@ VOID error_req_param_missing (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_REQ_PARAM_MISSING, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
@ -165,7 +165,7 @@ VOID error_invalid_drive (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_DRIVE, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
@ -173,7 +173,7 @@ VOID error_bad_command (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_BADCOMMAND, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
@ -181,7 +181,7 @@ VOID error_no_pipe (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_CANNOTPIPE, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
@ -189,7 +189,7 @@ VOID error_out_of_memory (VOID)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_OUT_OF_MEMORY, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg)); ConErrPrintf ((LPTSTR)szMsg);
} }
@ -197,7 +197,7 @@ VOID error_invalid_parameter_format (LPTSTR s)
{ {
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_INVALID_PARAM_FORMAT, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf (_T((LPTSTR)szMsg), s); ConErrPrintf ((LPTSTR)szMsg, s);
} }
@ -208,9 +208,9 @@ VOID error_syntax (LPTSTR s)
LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
if (s) if (s)
ConErrPrintf (_T("%s - %s\n"),_T((LPTSTR)szMsg), s); ConErrPrintf (_T("%s - %s\n"),(LPTSTR)szMsg, s);
else else
ConErrPrintf (_T("%s.\n"), _T((LPTSTR)szMsg) ); ConErrPrintf (_T("%s.\n"), (LPTSTR)szMsg );
} }
@ -219,5 +219,5 @@ VOID msg_pause (VOID)
WCHAR szMsg[RC_STRING_MAX_SIZE]; WCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, (LPTSTR) szMsg,sizeof(szMsg)); LoadString( GetModuleHandle(NULL), STRING_ERROR_D_PAUSEMSG, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts (_T((LPTSTR)szMsg)); ConOutPuts ((LPTSTR)szMsg);
} }

View file

@ -25,9 +25,13 @@
* 23-Feb-2001 (Carl Nettelblad <cnettel@hem.passagen.se>) * 23-Feb-2001 (Carl Nettelblad <cnettel@hem.passagen.se>)
* Implemented preservation of echo flag. Some other for related * Implemented preservation of echo flag. Some other for related
* code in other files fixed, too. * code in other files fixed, too.
*
* 28-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/ */
#include "precomp.h" #include "precomp.h"
#include "resource.h"
/* /*
@ -49,6 +53,7 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
LPBATCH_CONTEXT lpNew; LPBATCH_CONTEXT lpNew;
LPTSTR pp; LPTSTR pp;
TCHAR var; TCHAR var;
WCHAR szMsg[RC_STRING_MAX_SIZE];
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param); DebugPrintf (_T("cmd_for (\'%s\', \'%s\'\n"), cmd, param);
@ -56,17 +61,9 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
ConOutPuts (_T("Runs a specified command for each file in a set of files\n" LoadString( GetModuleHandle(NULL), STRING_FOR_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
"\n" ConOutPuts ((LPTSTR)szMsg);
"FOR %variable IN (set) DO command [parameters]\n"
"\n"
" %variable Specifies a replaceable parameter.\n"
" (set) Specifies a set of one or more files. Wildcards may be used.\n"
" command Specifies the command to carry out for each file.\n"
" parameters Specifies parameters or switches for the specified command.\n"
"\n"
"To user the FOR comamnd in a batch program, specify %%variable instead of\n"
"%variable."));
return 0; return 0;
} }
@ -86,7 +83,8 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Check next element is 'IN' */ /* Check next element is 'IN' */
if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2))) if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2)))
{ {
error_syntax (_T("'in' missing in for statement.")); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
error_syntax ((LPTSTR)szMsg);
return 1; return 1;
} }
@ -97,7 +95,9 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Folowed by a '(', find also matching ')' */ /* Folowed by a '(', find also matching ')' */
if ((*param != _T('(')) || (NULL == (pp = _tcsrchr (param, _T(')'))))) if ((*param != _T('(')) || (NULL == (pp = _tcsrchr (param, _T(')')))))
{ {
error_syntax (_T("no brackets found.")); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg));
error_syntax ((LPTSTR)szMsg);
return 1; return 1;
} }
@ -110,7 +110,8 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Check DO follows */ /* Check DO follows */
if ((_tcsnicmp (pp, _T("do"), 2) != 0) || !_istspace (*(pp + 2))) if ((_tcsnicmp (pp, _T("do"), 2) != 0) || !_istspace (*(pp + 2)))
{ {
error_syntax (_T("'do' missing.")); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg));
error_syntax ((LPTSTR)szMsg);
return 1; return 1;
} }
@ -121,7 +122,9 @@ INT cmd_for (LPTSTR cmd, LPTSTR param)
/* Check that command tail is not empty */ /* Check that command tail is not empty */
if (*pp == _T('\0')) if (*pp == _T('\0'))
{ {
error_syntax (_T("no command after 'do'.")); LoadString( GetModuleHandle(NULL), STRING_FOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg));
error_syntax ((LPTSTR)szMsg);
return 1; return 1;
} }

View file

@ -53,62 +53,71 @@
#define STRING_DEL_ERROR8 331 #define STRING_DEL_ERROR8 331
#define STRING_ERROR_ERROR1 332 #define STRING_ERROR_ERROR1 332
#define STRING_ERROR_ERROR2 333 #define STRING_ERROR_ERROR2 333
#define STRING_FOR_ERROR1 334
#define STRING_FOR_ERROR2 335
#define STRING_FOR_ERROR3 336
#define STRING_FOR_ERROR4 337
#define STRING_FREE_ERROR1 338
#define STRING_FREE_ERROR2 339
#define STRING_PARAM_ERROR 340
#define STRING_PARAM_ERROR 334
#define STRING_ATTRIB_HELP 400 #define STRING_ATTRIB_HELP 600
#define STRING_ALIAS_HELP 401 #define STRING_ALIAS_HELP 601
#define STRING_BEEP_HELP 402 #define STRING_BEEP_HELP 602
#define STRING_CALL_HELP 403 #define STRING_CALL_HELP 603
#define STRING_CD_HELP 404 #define STRING_CD_HELP 604
#define STRING_CHCP_HELP 405 #define STRING_CHCP_HELP 605
#define STRING_CHOICE_HELP 406 #define STRING_CHOICE_HELP 606
#define STRING_CLS_HELP 407 #define STRING_CLS_HELP 607
#define STRING_CMD_HELP1 408 #define STRING_CMD_HELP1 608
#define STRING_CMD_HELP2 409 #define STRING_CMD_HELP2 609
#define STRING_CMD_HELP3 410 #define STRING_CMD_HELP3 610
#define STRING_CMD_HELP4 411 #define STRING_CMD_HELP4 611
#define STRING_CMD_HELP5 412 #define STRING_CMD_HELP5 612
#define STRING_CMD_HELP6 413 #define STRING_CMD_HELP6 613
#define STRING_CMD_HELP7 414 #define STRING_CMD_HELP7 614
#define STRING_CMD_HELP8 415 #define STRING_CMD_HELP8 615
#define STRING_COLOR_HELP1 416 #define STRING_COLOR_HELP1 616
#define STRING_COPY_HELP1 417 #define STRING_COPY_HELP1 617
#define STRING_COPY_HELP2 418 #define STRING_COPY_HELP2 618
#define STRING_DATE_HELP1 419 #define STRING_DATE_HELP1 619
#define STRING_DATE_HELP2 420 #define STRING_DATE_HELP2 620
#define STRING_DATE_HELP3 421 #define STRING_DATE_HELP3 621
#define STRING_DATE_HELP4 422 #define STRING_DATE_HELP4 622
#define STRING_DEL_HELP1 423 #define STRING_DEL_HELP1 623
#define STRING_DEL_HELP2 424 #define STRING_DEL_HELP2 624
#define STRING_DEL_HELP3 425 #define STRING_DEL_HELP3 625
#define STRING_DEL_HELP4 426 #define STRING_DEL_HELP4 626
#define STRING_DELAY_HELP 427 #define STRING_DELAY_HELP 627
#define STRING_DIR_HELP1 428 #define STRING_DIR_HELP1 628
#define STRING_DIR_HELP2 429 #define STRING_DIR_HELP2 629
#define STRING_DIR_HELP3 430 #define STRING_DIR_HELP3 630
#define STRING_DIR_HELP4 431 #define STRING_DIR_HELP4 631
#define STRING_DIR_HELP5 432 #define STRING_DIR_HELP5 632
#define STRING_DIR_HELP6 433 #define STRING_DIR_HELP6 633
#define STRING_DIR_HELP7 434 #define STRING_DIR_HELP7 634
#define STRING_DIR_HELP8 435 #define STRING_DIR_HELP8 635
#define STRING_DIRSTACK_HELP1 436 #define STRING_DIRSTACK_HELP1 636
#define STRING_DIRSTACK_HELP2 437 #define STRING_DIRSTACK_HELP2 637
#define STRING_DIRSTACK_HELP3 438 #define STRING_DIRSTACK_HELP3 638
#define STRING_DIRSTACK_HELP4 439 #define STRING_DIRSTACK_HELP4 639
#define STRING_ECHO_HELP1 440 #define STRING_ECHO_HELP1 640
#define STRING_ECHO_HELP2 441 #define STRING_ECHO_HELP2 641
#define STRING_ECHO_HELP3 442 #define STRING_ECHO_HELP3 642
#define STRING_ECHO_HELP4 443 #define STRING_ECHO_HELP4 643
#define STRING_ECHO_HELP5 444 #define STRING_ECHO_HELP5 644
#define STRING_EXIT_HELP 445 #define STRING_EXIT_HELP 645
#define STRING_MKDIR_HELP 446
#define STRING_RMDIR_HELP 447 #define STRING_FOR_HELP1 646
#define STRING_REM_HELP 448
#define STRING_MKDIR_HELP 647
#define STRING_RMDIR_HELP 648
#define STRING_REM_HELP 649