diff options
| author | Bernard Normier <bernard@zeroc.com> | 2021-01-04 14:47:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 14:47:55 -0500 |
| commit | 8b02e62b2d0801648867702e3c7f25881b439d10 (patch) | |
| tree | 022695f2b5ea3d4be6092df39bdb3bdecc62c4e1 /cpp | |
| parent | Fix localtime/gmtime usage (#1227) (diff) | |
| download | ice-8b02e62b2d0801648867702e3c7f25881b439d10.tar.bz2 ice-8b02e62b2d0801648867702e3c7f25881b439d10.tar.xz ice-8b02e62b2d0801648867702e3c7f25881b439d10.zip | |
Add editline support to icegridadmin and icestormadmin (#1223)
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Parser.cpp | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index c404797f42c..d8e997f9778 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -13,9 +13,8 @@ #include <IceGrid/DescriptorHelper.h> #include <IceBox/IceBox.h> -#ifdef HAVE_READLINE -# include <readline/readline.h> -# include <readline/history.h> +#if defined(__APPLE__) || defined(__linux__) +# include <editline/readline.h> #endif #include <iterator> @@ -2573,8 +2572,7 @@ Parser::getInput(char* buf, size_t& result, size_t maxSize) } else { -#ifdef HAVE_READLINE - +#if defined(__APPLE__) || defined(__linux__) const char* prompt = parser->getPrompt(); char* line = readline(const_cast<char*>(prompt)); if(!line) diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp index 7b64e514d75..52f22f71b55 100644 --- a/cpp/src/IceStorm/Parser.cpp +++ b/cpp/src/IceStorm/Parser.cpp @@ -9,9 +9,8 @@ #include <IceStorm/IceStormInternal.h> #include <algorithm> -#ifdef HAVE_READLINE -# include <readline/readline.h> -# include <readline/history.h> +#if defined(__APPLE__) || defined(__linux__) +# include <editline/readline.h> #endif extern FILE* yyin; @@ -445,8 +444,8 @@ Parser::getInput(char* buf, size_t& result, size_t maxSize) } else { -#ifdef HAVE_READLINE +#if defined(__APPLE__) || defined(__linux__) const char* prompt = parser->getPrompt(); char* line = readline(const_cast<char*>(prompt)); if(!line) @@ -474,9 +473,7 @@ Parser::getInput(char* buf, size_t& result, size_t maxSize) free(line); } } - #else - consoleOut << parser->getPrompt() << flush; string line; |