From 35240bd337fff03c07dd78504b10d4b70d52124c Mon Sep 17 00:00:00 2001 From: Brandon Turner Date: Sat, 3 Sep 2005 01:34:40 +0000 Subject: [PATCH] Correctly assign %propmt%. cmd.c = give %prompt% default value of $P$G prompt.c = when param are null, assign %prompt% to $P$G svn path=/trunk/; revision=17613 --- reactos/subsys/system/cmd/cmd.c | 2 ++ reactos/subsys/system/cmd/prompt.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c index 8f4446ff166..ec01e3666c2 100644 --- a/reactos/subsys/system/cmd/cmd.c +++ b/reactos/subsys/system/cmd/cmd.c @@ -1358,6 +1358,8 @@ Initialize (int argc, TCHAR* argv[]) hOut = GetStdHandle (STD_OUTPUT_HANDLE); hIn = GetStdHandle (STD_INPUT_HANDLE); + SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); + if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { diff --git a/reactos/subsys/system/cmd/prompt.c b/reactos/subsys/system/cmd/prompt.c index c5887e804ca..34cad00a3c7 100644 --- a/reactos/subsys/system/cmd/prompt.c +++ b/reactos/subsys/system/cmd/prompt.c @@ -193,7 +193,7 @@ VOID PrintPrompt(VOID) INT cmd_prompt (LPTSTR cmd, LPTSTR param) { - + TCHAR szParam[512]; if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_PROMPT_HELP1); @@ -204,9 +204,13 @@ INT cmd_prompt (LPTSTR cmd, LPTSTR param) ConOutResPaging(FALSE,STRING_PROMPT_HELP3); return 0; } + if (param[0] != _T('\0')) + _tcscpy(szParam,param); + else + _tcscpy(szParam,_T("$P$G")); /* set PROMPT environment variable */ - if (!SetEnvironmentVariable (_T("PROMPT"), param)) + if (!SetEnvironmentVariable (_T("PROMPT"), szParam)) return 1; return 0; -- 2.17.1