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

Compare commits

base: p:e49ff84b7448e8c9702648bcaf49b0344d077162
Branches Tags
p:master
p:v1.2.0
p:v1.1.0
p:v1.0.0
..
compare: p:90b5364b29a65d141b7f260a2be5ece5db140b36
Branches Tags
p:master
p:v1.2.0
p:v1.1.0
p:v1.0.0

No commits in common. "e49ff84b7448e8c9702648bcaf49b0344d077162" and "90b5364b29a65d141b7f260a2be5ece5db140b36" have entirely different histories.
e49ff84b74 ... 90b5364b29

5 changed files with 11 additions and 19 deletions
Show Stats Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -112,8 +112,8 @@ endforeach (page)
# CPack # CPack
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Shell for running JSON-RPC 2.0 queries") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Shell for running JSON-RPC 2.0 queries")
set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch") set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>") set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR}) set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR}) set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})

2
LICENSE
View File

@ -1,4 +1,4 @@
Copyright (c) 2014 - 2018, Přemysl Eric Janouch <p@janouch.name> Copyright (c) 2014 - 2018, Přemysl Janouch <p@janouch.name>
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted. purpose with or without fee is hereby granted.

14
json-rpc-shell.c
View File

@ -1,7 +1,7 @@
/* /*
* json-rpc-shell.c: simple JSON-RPC 2.0 shell * json-rpc-shell.c: simple JSON-RPC 2.0 shell
* *
* Copyright (c) 2014 - 2016, Přemysl Eric Janouch <p@janouch.name> * Copyright (c) 2014 - 2016, Přemysl Janouch <p@janouch.name>
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted. * purpose with or without fee is hereby granted.
@ -531,8 +531,7 @@ input_el_redisplay (struct input_el *self)
el_push (self->editline, x); el_push (self->editline, x);
// We have to do this or it gets stuck and nothing is done // We have to do this or it gets stuck and nothing is done
int count = 0; (void) el_gets (self->editline, NULL);
(void) el_wgets (self->editline, &count);
} }
static char * static char *
@ -3177,16 +3176,9 @@ process_edited_input (struct app_context *ctx)
print_error ("%s: %s", "input editing failed", e->message); print_error ("%s: %s", "input editing failed", e->message);
error_free (e); error_free (e);
} }
else else if (!ctx->input->vtable->replace_line (ctx->input, input.str))
{
// Strip trailing newlines, added automatically by editors
while (input.len && strchr ("\r\n", input.str[input.len - 1]))
input.str[--input.len] = 0;
if (!ctx->input->vtable->replace_line (ctx->input, input.str))
print_error ("%s: %s", "input editing failed", print_error ("%s: %s", "input editing failed",
"could not re-insert modified text"); "could not re-insert modified text");
}
if (unlink (ctx->editor_filename)) if (unlink (ctx->editor_filename))
print_error ("could not unlink `%s': %s", print_error ("could not unlink `%s': %s",

2
json-rpc-test-server.c
View File

@ -1,7 +1,7 @@
/* /*
* json-rpc-test-server.c: JSON-RPC 2.0 demo server * json-rpc-test-server.c: JSON-RPC 2.0 demo server
* *
* Copyright (c) 2015 - 2018, Přemysl Eric Janouch <p@janouch.name> * Copyright (c) 2015 - 2018, Přemysl Janouch <p@janouch.name>
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted. * purpose with or without fee is hereby granted.

2
liberty

@ -1 +1 @@
Subproject commit 1a76b2032e6d18d9f95d9d0bb98edc26023c8618 Subproject commit bca7167d037d857448cb18243425d7c61de3bdd5