From 586eb1abb437420e5b7678890abb82fdbd1f7c45 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 9 Mar 2016 00:25:12 +0100 Subject: [PATCH] i9e: Fix compilation on Ubuntu-12.04. Commit c0162946 (i9e: Avoid key binding macros) from half a year ago broke compilation for readline-6.2, which ships at least with Ubuntu-12.04. The problem is that c0162946 changed dispatch_key() to use rl_executing_keyseq, a readline variable that was introduced in readline-6.3. Compilation fails on systems with readline-6.2 or older because the variable does not exist. This patch modifies interactive.c to provide an equivalent of rl_executing_keyseq and changes dispatch_key() to use this version instead. --- interactive.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/interactive.c b/interactive.c index 9f8a5013..a568d3c5 100644 --- a/interactive.c +++ b/interactive.c @@ -28,6 +28,8 @@ struct i9e_private { int num_columns; int num_key_bindings; char empty_line[1000]; + char key_sequence[32]; + unsigned key_sequence_length; struct task *task; struct btr_node *stdout_btrn; bool last_write_was_status; @@ -328,8 +330,26 @@ static int i9e_post_select(__a_unused struct sched *s, __a_unused void *context) ret = 0; if (i9ep->caught_sigint) goto rm_btrn; - while (input_available()) + while (input_available()) { + if (i9ep->stdout_btrn) { + unsigned len = i9ep->key_sequence_length; + assert(len < sizeof(i9ep->key_sequence) - 1); + buf = i9ep->key_sequence + len; + ret = read(i9ep->ici->fds[0], buf, 1); + if (ret < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto rm_btrn; + } + ret = -E_I9E_EOF; + if (ret == 0) + goto rm_btrn; + buf[1] = '\0'; + i9ep->key_sequence_length++; + rl_stuff_char((int)(unsigned char)*buf); + } rl_callback_read_char(); + ret = 0; + } if (!i9ep->stdout_btrn) goto out; ret = btr_node_status(i9ep->stdout_btrn, 0, BTR_NT_LEAF); @@ -418,8 +438,10 @@ static int dispatch_key(__a_unused int count, __a_unused int key) int i, ret; for (i = i9ep->num_key_bindings - 1; i >= 0; i--) { - if (strcmp(rl_executing_keyseq, i9ep->ici->bound_keyseqs[i])) + if (strcmp(i9ep->key_sequence, i9ep->ici->bound_keyseqs[i])) continue; + i9ep->key_sequence[0] = '\0'; + i9ep->key_sequence_length = 0; ret = i9ep->ici->key_handler(i); return ret < 0? ret : 0; } @@ -470,6 +492,11 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s) int i; /* bind each key sequence to our dispatcher */ for (i = 0; (seq = ici->bound_keyseqs[i]); i++) { + if (strlen(seq) >= sizeof(i9ep->key_sequence) - 1) { + PARA_WARNING_LOG("ignoring overlong key %s\n", + seq); + continue; + } if (rl_bind_keyseq_in_map(seq, dispatch_key, i9ep->bare_km) != 0) PARA_WARNING_LOG("could not bind #%d: %s\n", i, seq); -- 2.39.2