p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Bump liberty, fix GNUC detection, update README

This commit is contained in:
Přemysl Eric Janouch 2018-04-16 15:53:30 +02:00
parent 989825f7eb
commit d8fcb22daf
Signed by: p
GPG Key ID: B715679E3A361BE6
4 changed files with 27 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -6,11 +6,11 @@ option (WANT_READLINE "Use GNU Readline for the UI (better)" ON)
option (WANT_LIBEDIT "Use BSD libedit for the UI" OFF) option (WANT_LIBEDIT "Use BSD libedit for the UI" OFF)
# Moar warnings # Moar warnings
if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUC) if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
# -Wunused-function is pretty annoying here, as everything is static # -Wunused-function is pretty annoying here, as everything is static
set (CMAKE_C_FLAGS set (CMAKE_C_FLAGS
"${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Wno-unused-function") "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Wno-unused-function")
endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUC) endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
# Version # Version
set (project_VERSION_MAJOR "0") set (project_VERSION_MAJOR "0")

2
README.adoc
View File

@ -77,6 +77,8 @@ Use this project's GitHub to report any bugs, request features, or submit pull
requests. If you want to discuss this project, or maybe just hang out with requests. If you want to discuss this project, or maybe just hang out with
the developer, feel free to join me at irc://irc.janouch.name, channel #dev. the developer, feel free to join me at irc://irc.janouch.name, channel #dev.
Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
License License
------- -------
'json-rpc-shell' is written by Přemysl Janouch <p.janouch@gmail.com>. 'json-rpc-shell' is written by Přemysl Janouch <p.janouch@gmail.com>.

62
json-rpc-shell.c
View File

@ -1029,9 +1029,7 @@ get_config_string (struct config_item *root, const char *key)
static void static void
save_configuration (struct config_item *root, const char *path_hint) save_configuration (struct config_item *root, const char *path_hint)
{ {
struct str data; struct str data = str_make ();
str_init (&data);
str_append (&data, str_append (&data,
"# " PROGRAM_NAME " " PROGRAM_VERSION " configuration file\n" "# " PROGRAM_NAME " " PROGRAM_VERSION " configuration file\n"
"#\n" "#\n"
@ -1780,8 +1778,7 @@ static bool
backend_ws_send_message (struct ws_context *self, backend_ws_send_message (struct ws_context *self,
enum ws_opcode opcode, const void *data, size_t len) enum ws_opcode opcode, const void *data, size_t len)
{ {
struct str header; struct str header = str_make ();
str_init (&header);
str_pack_u8 (&header, 0x80 | (opcode & 0x0F)); str_pack_u8 (&header, 0x80 | (opcode & 0x0F));
if (len > UINT16_MAX) if (len > UINT16_MAX)
@ -1870,13 +1867,11 @@ static bool
backend_ws_finish_closing_handshake backend_ws_finish_closing_handshake
(struct ws_context *self, const struct ws_parser *parser) (struct ws_context *self, const struct ws_parser *parser)
{ {
struct str reason; struct str reason = str_make ();
str_init (&reason);
if (parser->payload_len >= 2) if (parser->payload_len >= 2)
{ {
struct msg_unpacker unpacker; struct msg_unpacker unpacker =
msg_unpacker_init (&unpacker, parser->input.str, parser->payload_len); msg_unpacker_make (parser->input.str, parser->payload_len);
uint16_t status_code; uint16_t status_code;
msg_unpacker_u16 (&unpacker, &status_code); msg_unpacker_u16 (&unpacker, &status_code);
@ -2004,8 +1999,7 @@ backend_ws_connect (struct ws_context *self, struct error **e)
self->url.field_data[UF_PORT].len) self->url.field_data[UF_PORT].len)
: xstrdup (use_tls ? "443" : "80"); : xstrdup (use_tls ? "443" : "80");
struct str url_path; struct str url_path = str_make ();
str_init (&url_path);
if (self->url.field_set & (1 << UF_PATH)) if (self->url.field_set & (1 << UF_PATH))
str_append_data (&url_path, self->endpoint + str_append_data (&url_path, self->endpoint +
self->url.field_data[UF_PATH].off, self->url.field_data[UF_PATH].off,
@ -2035,16 +2029,13 @@ backend_ws_connect (struct ws_context *self, struct error **e)
goto fail_2; goto fail_2;
} }
struct str key_b64; struct str key_b64 = str_make ();
str_init (&key_b64);
base64_encode (key, sizeof key, &key_b64); base64_encode (key, sizeof key, &key_b64);
free (self->key); free (self->key);
char *key_b64_string = self->key = str_steal (&key_b64); char *key_b64_string = self->key = str_steal (&key_b64);
struct str request; struct str request = str_make ();
str_init (&request);
str_append_printf (&request, "GET %s HTTP/1.1\r\n", url_path.str); str_append_printf (&request, "GET %s HTTP/1.1\r\n", url_path.str);
// TODO: omit the port if it's the default (check RFC for "SHOULD" or ...) // TODO: omit the port if it's the default (check RFC for "SHOULD" or ...)
str_append_printf (&request, "Host: %s:%s\r\n", url_host, url_port); str_append_printf (&request, "Host: %s:%s\r\n", url_host, url_port);
@ -2070,7 +2061,7 @@ backend_ws_connect (struct ws_context *self, struct error **e)
str_reset (&self->value); str_reset (&self->value);
str_map_clear (&self->headers); str_map_clear (&self->headers);
ws_parser_free (&self->parser); ws_parser_free (&self->parser);
ws_parser_init (&self->parser); self->parser = ws_parser_make ();
self->parser.on_frame_header = backend_ws_on_frame_header; self->parser.on_frame_header = backend_ws_on_frame_header;
self->parser.on_frame = backend_ws_on_frame; self->parser.on_frame = backend_ws_on_frame;
self->parser.user_data = self; self->parser.user_data = self;
@ -2215,14 +2206,13 @@ backend_ws_new (struct app_context *ctx,
self->server_fd = -1; self->server_fd = -1;
ev_io_init (&self->read_watcher, NULL, 0, 0); ev_io_init (&self->read_watcher, NULL, 0, 0);
http_parser_init (&self->hp, HTTP_RESPONSE); http_parser_init (&self->hp, HTTP_RESPONSE);
str_init (&self->field); self->field = str_make ();
str_init (&self->value); self->value = str_make ();
str_map_init (&self->headers); self->headers = str_map_make (free);
self->headers.key_xfrm = tolower_ascii_strxfrm; self->headers.key_xfrm = tolower_ascii_strxfrm;
self->headers.free = free; self->parser = ws_parser_make ();
ws_parser_init (&self->parser); self->message_data = str_make ();
str_init (&self->message_data); self->extra_headers = strv_make ();
strv_init (&self->extra_headers);
self->endpoint = xstrdup (endpoint); self->endpoint = xstrdup (endpoint);
self->url = *url; self->url = *url;
@ -2265,9 +2255,7 @@ validate_json_rpc_content_type (const char *content_type)
char *type = NULL; char *type = NULL;
char *subtype = NULL; char *subtype = NULL;
struct str_map parameters; struct str_map parameters = str_map_make (free);
str_map_init (&parameters);
parameters.free = free;
parameters.key_xfrm = tolower_ascii_strxfrm; parameters.key_xfrm = tolower_ascii_strxfrm;
bool result = http_parse_media_type bool result = http_parse_media_type
@ -2431,7 +2419,7 @@ jtokenizer_init (struct jtokenizer *self, const char *p, size_t len)
{ {
self->p = p; self->p = p;
self->len = len; self->len = len;
str_init (&self->chunk); self->chunk = str_make ();
} }
static void static void
@ -2886,9 +2874,7 @@ make_json_rpc_call (struct app_context *ctx,
free (req_term); free (req_term);
} }
struct str buf; struct str buf = str_make ();
str_init (&buf);
struct error *e = NULL; struct error *e = NULL;
if (!ctx->backend->vtable->make_call if (!ctx->backend->vtable->make_call
(ctx->backend, req_utf8, id != NULL, &buf, &e)) (ctx->backend, req_utf8, id != NULL, &buf, &e))
@ -3046,8 +3032,7 @@ fail:
static char * static char *
resolve_relative_runtime_unique_filename (const char *filename) resolve_relative_runtime_unique_filename (const char *filename)
{ {
struct str path; struct str path = str_make ();
str_init (&path);
const char *runtime_dir = getenv ("XDG_RUNTIME_DIR"); const char *runtime_dir = getenv ("XDG_RUNTIME_DIR");
const char *tmpdir = getenv ("TMPDIR"); const char *tmpdir = getenv ("TMPDIR");
@ -3177,9 +3162,7 @@ run_editor (const char *line, void *user_data)
static void static void
process_edited_input (struct app_context *ctx) process_edited_input (struct app_context *ctx)
{ {
struct str input; struct str input = str_make ();
str_init (&input);
struct error *e = NULL; struct error *e = NULL;
if (!read_file (ctx->editor_filename, &input, &e)) if (!read_file (ctx->editor_filename, &input, &e))
{ {
@ -3315,8 +3298,7 @@ parse_program_arguments (struct app_context *ctx, int argc, char **argv,
{ 0, NULL, NULL, 0, NULL } { 0, NULL, NULL, 0, NULL }
}; };
struct opt_handler oh; struct opt_handler oh = opt_handler_make (argc, argv, opts,
opt_handler_init (&oh, argc, argv, opts,
"ENDPOINT", "Simple JSON-RPC shell."); "ENDPOINT", "Simple JSON-RPC shell.");
int c; int c;
@ -3378,7 +3360,7 @@ parse_program_arguments (struct app_context *ctx, int argc, char **argv,
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
config_init (&g_ctx.config); g_ctx.config = config_make ();
register_config_modules (&g_ctx); register_config_modules (&g_ctx);
config_load (&g_ctx.config, config_item_object ()); config_load (&g_ctx.config, config_item_object ());

2
liberty

@ -1 +1 @@
Subproject commit 9afcb337ada91f87aa1a566ec3feba1a12bc9287 Subproject commit da75b6f7356e9dc34dc4005ee993cee84c6bf5ba