From f0d60bb689324dd36e2266bbde6ff537f6d2233f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Wed, 8 Apr 2015 02:24:07 +0200 Subject: [PATCH] Handle quitting a bit better And add some documentation. --- json-rpc-shell.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/json-rpc-shell.c b/json-rpc-shell.c index 1e7038a..bdbf27b 100644 --- a/json-rpc-shell.c +++ b/json-rpc-shell.c @@ -85,12 +85,22 @@ struct app_context; struct backend_iface { + /// Prepare the backend for RPC calls void (*init) (struct app_context *ctx, const char *endpoint, struct http_parser_url *url); + + /// Add an HTTP header to send with requests void (*add_header) (struct app_context *ctx, const char *header); + + /// Make an RPC call bool (*make_call) (struct app_context *ctx, const char *request, bool expect_content, struct str *buf, struct error **e); + + /// Do everything necessary to deal with ev_break(EVBREAK_ALL) + void (*on_quit) (struct app_context *ctx); + + /// Free any resources void (*destroy) (struct app_context *ctx); }; @@ -1402,6 +1412,16 @@ backend_ws_make_call (struct app_context *ctx, return true; } +static void +backend_ws_on_quit (struct app_context *ctx) +{ + struct ws_context *self = &ctx->ws; + if (self->waiting_for_event && !self->e) + error_set (&self->e, "aborted by user"); + + // We also have to be careful not to change the ev_break status +} + static void backend_ws_destroy (struct app_context *ctx) { @@ -1432,6 +1452,7 @@ static struct backend_iface g_backend_ws = .init = backend_ws_init, .add_header = backend_ws_add_header, .make_call = backend_ws_make_call, + .on_quit = backend_ws_on_quit, .destroy = backend_ws_destroy, }; @@ -1861,6 +1882,9 @@ on_readline_input (char *line) if (!line) { + if (g_ctx.backend->on_quit) + g_ctx.backend->on_quit (&g_ctx); + ev_break (EV_DEFAULT_ EVBREAK_ALL); // We must do this here, or the prompt gets printed twice. *shrug*