djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Remove remaining, obsolete traces of GNU readline support.

Browse Source
This commit is contained in:
Damien George 2017-03-03 17:55:40 +11:00
parent 3d91c12d33
commit 5e83a75c78
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unix/input.c
View File

@ -35,10 +35,6 @@
#if MICROPY_USE_READLINE == 1 #if MICROPY_USE_READLINE == 1
#include "lib/mp-readline/readline.h" #include "lib/mp-readline/readline.h"
#elif MICROPY_USE_READLINE == 2
#include <readline/readline.h>
#include <readline/history.h>
#include <readline/tilde.h>
#endif #endif
char *prompt(char *p) { char *prompt(char *p) {
@ -66,12 +62,6 @@ char *prompt(char *p) {
char *line = malloc(vstr.len + 1); char *line = malloc(vstr.len + 1);
memcpy(line, vstr.buf, vstr.len + 1); memcpy(line, vstr.buf, vstr.len + 1);
vstr_clear(&vstr); vstr_clear(&vstr);
#elif MICROPY_USE_READLINE == 2
// GNU readline
char *line = readline(p);
if (line) {
add_history(line);
}
#else #else
// simple read string // simple read string
static char buf[256]; static char buf[256];
@ -124,8 +114,6 @@ void prompt_read_history(void) {
} }
vstr_clear(&vstr); vstr_clear(&vstr);
} }
#elif MICROPY_USE_READLINE == 2
read_history(tilde_expand("~/.micropython.history"));
#endif #endif
#endif #endif
} }
@ -152,8 +140,6 @@ void prompt_write_history(void) {
close(fd); close(fd);
} }
} }
#elif MICROPY_USE_READLINE == 2
write_history(tilde_expand("~/.micropython.history"));
#endif #endif
#endif #endif
} }

2
unix/main.c
View File

@ -249,7 +249,7 @@ STATIC int do_repl(void) {
#else #else
// use GNU or simple readline // use simple readline
for (;;) { for (;;) {
char *line = prompt(">>> "); char *line = prompt(">>> ");