Land #19711, Use existing input object when calling init_tab_complete

rapid7 · Dec 11, 2024 · 65612d6 · 65612d6
2 parents e7b04ab + 4293aac
commit 65612d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/msf/ui/console/driver.rb b/lib/msf/ui/console/driver.rb
@@ -107,7 +107,7 @@ def initialize(prompt = DefaultPrompt, prompt_char = DefaultPromptChar, opts = {
     # Initialize the user interface to use a different input and output
     # handle if one is supplied
     input = opts['LocalInput']
-    input ||= Rex::Ui::Text::Input::Stdio.new
+    input ||= Rex::Ui::Text::Input::Readline.new
 
     if !opts['Readline']
       input.disable_readline

diff --git a/lib/rex/ui/text/shell.rb b/lib/rex/ui/text/shell.rb
@@ -66,8 +66,7 @@ def initialize(prompt, prompt_char = '>', histfile = nil, framework = nil, name
   def init_tab_complete
     if (self.input and self.input.supports_readline)
       # Unless cont_flag because there's no tab complete for continuation lines
-      self.input = Input::Readline.new(lambda { |str| tab_complete(str) unless cont_flag })
-      self.input.output = self.output
+      self.input.reset_tab_completion(lambda { |str| tab_complete(str) unless cont_flag })
     end
   end