Ticket #4815: Fix no colored prompt after switching panels off for the first time

Fix the issue by strictly distinguishing between mc_prompt, which should
be stripped using strip_ctrl_codes(), and subshell_prompt, which should
always hold the original, non-stripped PS1. Make mc_prompt heap-based.

Signed-off-by: Jakub Horký <[email protected]>

Author: Jakub Horký

src/filemanager/filemanager.c

@@ -109,7 +109,7 @@ WLabel *the_hint;
 WButtonBar *the_bar;
 
 /* The prompt */
-const char *mc_prompt = NULL;
+char *mc_prompt = NULL;
 
 /*** file scope macro definitions ****************************************************************/
 

src/filemanager/filemanager.h

@@ -35,7 +35,7 @@ extern WPanel *left_panel;
 extern WPanel *right_panel;
 extern WPanel *current_panel;
 
-extern const char *mc_prompt;
+extern char *mc_prompt;
 
 /*** declarations of public functions ************************************************************/
 

src/filemanager/layout.c

@@ -974,7 +974,6 @@ setup_cmdline (void)
     const WRect *r = &mw->rect;
     int prompt_width;
     int y;
-    char *tmp_prompt = (char *) mc_prompt;
 
     if (!command_prompt)
         return;
@@ -984,32 +983,26 @@ setup_cmdline (void)
     {
         // Workaround: avoid crash on FreeBSD (see ticket #4213 for details)
         if (subshell_prompt != NULL)
-            tmp_prompt = g_string_free (subshell_prompt, FALSE);
-        else
-            tmp_prompt = g_strdup (mc_prompt);
-        (void) strip_ctrl_codes (tmp_prompt);
+        {
+            g_free (mc_prompt);
+            mc_prompt = g_strndup (subshell_prompt->str, subshell_prompt->len);
+        }
+
+        (void) strip_ctrl_codes (mc_prompt);
     }
 #endif
 
-    prompt_width = str_term_width1 (tmp_prompt);
+    prompt_width = str_term_width1 (mc_prompt);
 
     // Check for prompts too big
     if (r->cols > 8 && prompt_width > r->cols - 8)
     {
         int prompt_len;
 
         prompt_width = r->cols - 8;
-        prompt_len = str_offset_to_pos (tmp_prompt, prompt_width);
-        tmp_prompt[prompt_len] = '\0';
-    }
-
-#ifdef ENABLE_SUBSHELL
-    if (mc_global.tty.use_subshell)
-    {
-        subshell_prompt = g_string_new_take (tmp_prompt);
-        mc_prompt = subshell_prompt->str;
+        prompt_len = str_offset_to_pos (mc_prompt, prompt_width);
+        mc_prompt[prompt_len] = '\0';
     }
-#endif
 
     y = r->lines - 1 - (mc_global.keybar_visible ? 1 : 0);
 

src/main.c

@@ -419,7 +419,7 @@ main (int argc, char *argv[])
         enable_bracketed_paste ();
 
         // subshell_prompt is NULL here
-        mc_prompt = (geteuid () == 0) ? "# " : "$ ";
+        mc_prompt = g_strdup ((geteuid () == 0) ? "# " : "$ ");
     }
 
     // Program main loop
@@ -428,6 +428,8 @@ main (int argc, char *argv[])
     else
         exit_code = do_nc () ? EXIT_SUCCESS : EXIT_FAILURE;
 
+    g_free (mc_prompt);
+
     disable_bracketed_paste ();
 
     disable_mouse ();