[ros-diffs] [reactos] 02/02: [CMD] If the prompt displays the information line on top of the screen, ensure that the prompt won't be hidden below it. CORE-16193

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=771b87dc8f4107de48715…

commit 771b87dc8f4107de48715c333e4da5113c4aef77
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Dec 29 19:08:47 2019 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Dec 29 19:14:03 2019 +0100

    [CMD] If the prompt displays the information line on top of the screen, ensure that
the prompt won't be hidden below it.
    CORE-16193
---
 base/shell/cmd/prompt.c | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/base/shell/cmd/prompt.c b/base/shell/cmd/prompt.c
index 9bf01e07e76..ce47cd70499 100644
--- a/base/shell/cmd/prompt.c
+++ b/base/shell/cmd/prompt.c
@@ -108,16 +108,33 @@ VOID PrintInfoLine(VOID)
  */
 VOID PrintPrompt(VOID)
 {
-    LPTSTR pr;
+    LPTSTR pr, Prompt;
     TCHAR szPrompt[256];
     TCHAR szPath[MAX_PATH];
 
     if (GetEnvironmentVariable(_T("PROMPT"), szPrompt, _countof(szPrompt)))
-        pr = szPrompt;
+        Prompt = szPrompt;
     else
-        pr = DefaultPrompt;
+        Prompt = DefaultPrompt;
 
-    while (*pr)
+    /*
+     * Special pre-handling for $I: If the information line is displayed
+     * on top of the screen, ensure that the prompt won't be hidden below it.
+     */
+    for (pr = Prompt; *pr;)
+    {
+        if (*pr++ != _T('$'))
+            continue;
+        if (!*pr || _totupper(*pr++) != _T('I'))
+            continue;
+
+        if (GetCursorY() == 0)
+            ConOutChar(_T('\n'));
+        break;
+    }
+
+    /* Parse the prompt string */
+    for (pr = Prompt; *pr; ++pr)
     {
         if (*pr != _T('$'))
         {
@@ -125,8 +142,8 @@ VOID PrintPrompt(VOID)
         }
         else
         {
-            pr++;
-
+            ++pr;
+            if (!*pr) break;
             switch (_totupper(*pr))
             {
                 case _T('A'):
@@ -158,9 +175,7 @@ VOID PrintPrompt(VOID)
                     break;
 
                 case _T('H'):
-                    ConOutChar(_T('\x08'));
-                    ConOutChar(_T(' '));
-                    ConOutChar(_T('\x08'));
+                    ConOutPuts(_T("\x08 \x08"));
                     break;
 
                 case _T('I'):
@@ -205,12 +220,12 @@ VOID PrintPrompt(VOID)
                     ConOutChar(_T('\n'));
                     break;
 
-                case '$':
+                case _T('$'):
                     ConOutChar(_T('$'));
                     break;
 
 #ifdef FEATURE_DIRECTORY_STACK
-                case '+':
+                case _T('+'):
                 {
                     INT i;
                     for (i = 0; i < GetDirectoryStackDepth(); i++)
@@ -220,7 +235,6 @@ VOID PrintPrompt(VOID)
 #endif
             }
         }
-        pr++;
     }
 }