From 10a7462e795bc88e409533fadeab012dd1859da2 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 22 Mar 2018 18:44:54 +0100 Subject: extsh: add linenoise input handling --- src/extsh.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/extsh.cpp') diff --git a/src/extsh.cpp b/src/extsh.cpp index 9dfeea8..1c223d9 100644 --- a/src/extsh.cpp +++ b/src/extsh.cpp @@ -1,5 +1,7 @@ #include "fs/extfs.hpp" +#include + #include #include #include @@ -15,7 +17,7 @@ enum struct result : std::uint8_t result process(std::string const & command) { - if(command == "exit") + if(command == "exit" || command.empty()) { return result::exit; } @@ -25,10 +27,19 @@ result process(std::string const & command) std::string prompt(fs::extfs const & disk) { - std::cout << '[' << (disk.has_label() ? disk.label() : "No Label") << "] >>> "; - std::string command{}; - std::cin >> command; - return command; + using namespace std::string_literals; + + auto const promptText = "["s + (disk.has_label() ? disk.label() : "No Label") + "] > "; + auto const input = linenoise(promptText.c_str()); + if(input) + { + linenoiseHistoryAdd(input); + auto const inputString = std::string{input}; + linenoiseFree(input); + return inputString; + } + + return {}; } void repl(fs::extfs & disk) @@ -59,6 +70,7 @@ int main(int argc, char const * argv[]) if(disk.open()) { + linenoiseHistorySetMaxLen(1024); repl(disk); } else -- cgit v1.2.3