Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consider libreadline/libedit only in interactive mode #1207

Merged
merged 3 commits into from
Dec 14, 2022
Merged

Consider libreadline/libedit only in interactive mode #1207

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30bffc3
Consider libreadline/libedit only in interactive mode
dl8dtl Dec 1, 2022
d746cef
Consider EditLine wrapper
dl8dtl Dec 10, 2022
c51c5e7
Use rl_readline_version rather than rl_library_version
dl8dtl Dec 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/term.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ void term_gotline(char *cmdstr) {
}


int terminal_mode(PROGRAMMER *pgm, struct avrpart *p) {
int terminal_mode_interactive(PROGRAMMER *pgm, struct avrpart *p) {
term_pgm = pgm; // For callback routine
term_p = p;

Expand All @@ -1379,10 +1379,10 @@ int terminal_mode(PROGRAMMER *pgm, struct avrpart *p) {
return pgm->flush_cache(pgm, p);
}

#else
#endif


int terminal_mode(PROGRAMMER *pgm, struct avrpart *p) {
int terminal_mode_noninteractive(PROGRAMMER *pgm, struct avrpart *p) {
char *cmdbuf;
int rc = 0;

Expand All @@ -1398,7 +1398,17 @@ int terminal_mode(PROGRAMMER *pgm, struct avrpart *p) {
return pgm->flush_cache(pgm, p);
}

int terminal_mode(PROGRAMMER *pgm, struct avrpart *p) {
#if defined(HAVE_LIBREADLINE)
// GNU libreadline can also work if input is a pipe.
// EditLine (NetBSD, MacOS) has issues with that, so only use it when
// running interactively.
// EditLine uses version 4.2 (0x0402).
if (isatty(fileno(stdin)) || (rl_readline_version >= 0x0500))
return terminal_mode_interactive(pgm, p);
#endif
return terminal_mode_noninteractive(pgm, p);
}

static void update_progress_tty(int percent, double etime, const char *hdr, int finish) {
static char *header;
Expand Down