Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

revers brandon change to prompt.c they are incorrect. Add a check if prompt env are set or not. if it is not set cmd set the prompt value. in cmd.c brandon forget that.

Browse source 
svn path=/trunk/; revision=17614
This commit is contained in:
Magnus Olsen 2005-09-03 09:46:46 +00:00
parent 35240bd337
commit 5d08c58541
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsys/system/cmd/cmd.c
View file

@ -1311,6 +1311,7 @@ Initialize (int argc, TCHAR* argv[])
TCHAR commandline[CMDLINE_LENGTH]; TCHAR commandline[CMDLINE_LENGTH];
TCHAR ModuleName[_MAX_PATH + 1]; TCHAR ModuleName[_MAX_PATH + 1];
INT i; INT i;
TCHAR lpBuffer[2];
//INT len; //INT len;
//TCHAR *ptr, *cmdLine; //TCHAR *ptr, *cmdLine;
@ -1358,6 +1359,11 @@ Initialize (int argc, TCHAR* argv[])
hOut = GetStdHandle (STD_OUTPUT_HANDLE); hOut = GetStdHandle (STD_OUTPUT_HANDLE);
hIn = GetStdHandle (STD_INPUT_HANDLE); hIn = GetStdHandle (STD_INPUT_HANDLE);
/* Set EnvironmentVariable PROMPT if it does not exists any env value.
for you can change the EnvirommentVariable for prompt before cmd start
this patch are not 100% right, if it does not exists a PROMPT value cmd should use
$P$G as defualt not set EnvirommentVariable PROMPT to $P$G if it does not exists */
if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, 2 * sizeof(TCHAR)) == 0)
SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); SetEnvironmentVariable (_T("PROMPT"), _T("$P$G"));

10
reactos/subsys/system/cmd/prompt.c
View file

@ -193,7 +193,6 @@ VOID PrintPrompt(VOID)
INT cmd_prompt (LPTSTR cmd, LPTSTR param) INT cmd_prompt (LPTSTR cmd, LPTSTR param)
{ {
TCHAR szParam[512];
if (!_tcsncmp (param, _T("/?"), 2)) if (!_tcsncmp (param, _T("/?"), 2))
{ {
ConOutResPaging(TRUE,STRING_PROMPT_HELP1); ConOutResPaging(TRUE,STRING_PROMPT_HELP1);
@ -204,14 +203,13 @@ INT cmd_prompt (LPTSTR cmd, LPTSTR param)
ConOutResPaging(FALSE,STRING_PROMPT_HELP3); ConOutResPaging(FALSE,STRING_PROMPT_HELP3);
return 0; return 0;
} }
if (param[0] != _T('\0'))
_tcscpy(szParam,param);
else
_tcscpy(szParam,_T("$P$G"));
/* set PROMPT environment variable */ /* set PROMPT environment variable */
if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) if (param[0] != _T('\0'))
{
if (!SetEnvironmentVariable (_T("PROMPT"), param))
return 1; return 1;
}
return 0; return 0;
} }