Skip to content

Commit b1922c3

Browse files
committed
Revert "Land #15941, fix command output in rpc console.write"
This reverts commit 8d808d1, reversing changes made to c1f06ea.
1 parent a0de825 commit b1922c3

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lib/msf/ui/console/driver.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,12 @@ def unknown_command(method, line)
474474
[method, method+".exe"].each do |cmd|
475475
if command_passthru && Rex::FileUtils.find_full_path(cmd)
476476

477+
print_status("exec: #{line}")
478+
print_line('')
479+
477480
self.busy = true
478481
begin
479-
Open3.popen2e(line) {|stdin,output,thread|
480-
output.each {|outline|
481-
print_line(outline.chomp)
482-
}
483-
}
482+
system(line)
484483
rescue ::Errno::EACCES, ::Errno::ENOENT
485484
print_error("Permission denied exec: #{line}")
486485
end

0 commit comments

Comments
 (0)